From a58012bf39cfb602007d868505e5b271164379c9 Mon Sep 17 00:00:00 2001 From: mcwillso Date: Sat, 16 Apr 2016 05:08:15 -0600 Subject: [PATCH] Allow zooming while rotating (#8634) --- examples/js/controls/OrbitControls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/js/controls/OrbitControls.js b/examples/js/controls/OrbitControls.js index 45d1b41099..c85232c4d2 100644 --- a/examples/js/controls/OrbitControls.js +++ b/examples/js/controls/OrbitControls.js @@ -756,7 +756,7 @@ THREE.OrbitControls = function ( object, domElement ) { function onMouseWheel( event ) { - if ( scope.enabled === false || scope.enableZoom === false || state !== STATE.NONE ) return; + if ( scope.enabled === false || scope.enableZoom === false || ( state !== STATE.NONE && state !== STATE.ROTATE ) ) return; event.preventDefault(); event.stopPropagation(); -- GitLab