Merge remote-tracking branch 'motin/quaternion-lookat' into dev

src/cameras/Camera.js

@@ -24,7 +24,15 @@ THREE.Camera.prototype.lookAt = function ( vector ) {
 
 	if ( this.rotationAutoUpdate === true ) {
 
-		this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
+		if ( this.useQuaternion === false )  {
+			
+			this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
+			
+		} else {
+			
+			this.quaternion.copy(this.matrix.decompose()[1]);
+			
+		}
 
 	}
 

src/core/Object3D.js

@@ -114,7 +114,15 @@ THREE.Object3D.prototype = {
 
 		if ( this.rotationAutoUpdate ) {
 
-			this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
+			if ( this.useQuaternion === false )  {
+
+				this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
+
+			} else {
+
+				this.quaternion.copy(this.matrix.decompose()[1]);
+
+			}
 
 		}