Просмотр исходного кода

Editor: Fixed ghost viewport camera (#28277)

* fixed viewport camera selector

* set viewport camera to editor.camera

* uses editor.camera as default camera
ycw 1 год назад
Родитель
Сommit
f17e2622e6
1 измененных файлов с 9 добавлено и 1 удалено
  1. 9 1
      editor/js/Viewport.Controls.js

+ 9 - 1
editor/js/Viewport.Controls.js

@@ -61,6 +61,8 @@ function ViewportControls( editor ) {
 
 
 	signals.editorCleared.add( function () {
 	signals.editorCleared.add( function () {
 
 
+		editor.setViewportCamera( editor.camera.uuid );
+
 		shadingSelect.setValue( 'solid' );
 		shadingSelect.setValue( 'solid' );
 		editor.setViewportShading( shadingSelect.getValue() );
 		editor.setViewportShading( shadingSelect.getValue() );
 
 
@@ -84,7 +86,13 @@ function ViewportControls( editor ) {
 		}
 		}
 
 
 		cameraSelect.setOptions( options );
 		cameraSelect.setOptions( options );
-		cameraSelect.setValue( editor.viewportCamera.uuid );
+
+		const selectedCamera = ( editor.viewportCamera.uuid in options )
+			? editor.viewportCamera
+			: editor.camera;
+
+		cameraSelect.setValue( selectedCamera.uuid );
+		editor.setViewportCamera( selectedCamera.uuid );
 
 
 	}
 	}