浏览代码

Editor: Disable EditorControls when camera is not editor.camera.

Mr.doob 5 年之前
父节点
当前提交
521a8ca495
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 2 0
      editor/js/EditorControls.js
  2. 3 0
      editor/js/Viewport.js

+ 2 - 0
editor/js/EditorControls.js

@@ -188,6 +188,8 @@ function EditorControls( object, domElement ) {
 
 
 	function onMouseWheel( event ) {
 	function onMouseWheel( event ) {
 
 
+		if ( scope.enabled === false ) return;
+
 		event.preventDefault();
 		event.preventDefault();
 
 
 		// Normalize deltaY due to https://bugzilla.mozilla.org/show_bug.cgi?id=1392460
 		// Normalize deltaY due to https://bugzilla.mozilla.org/show_bug.cgi?id=1392460

+ 3 - 0
editor/js/Viewport.js

@@ -617,6 +617,9 @@ function Viewport( editor ) {
 
 
 		}
 		}
 
 
+		// Disable EditorControls when setting a user camera
+		controls.enabled = viewportCamera === editor.camera;
+
 		camera = viewportCamera;
 		camera = viewportCamera;
 
 
 		render();
 		render();