Merge remote-tracking branch 'origin/dev' into dev

mrdoob · Nov 22, 2014 · f011c39 · f011c39
2 parents d976b30 + d07f3a5
commit f011c39
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/examples/js/controls/OrbitControls.js b/examples/js/controls/OrbitControls.js
@@ -256,7 +256,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		phi = Math.atan2( Math.sqrt( offset.x * offset.x + offset.z * offset.z ), offset.y );
 
-		if ( this.autoRotate ) {
+		if ( this.autoRotate && state === STATE.NONE ) {
 
 			this.rotateLeft( getAutoRotationAngle() );