Editor: Fixed ghost viewport camera (#28277)

* fixed viewport camera selector * set viewport camera to editor.camera * uses editor.camera as default camera
mrdoob · May 6, 2024 · f17e262 · f17e262
1 parent 79c3490
commit f17e262
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/editor/js/Viewport.Controls.js b/editor/js/Viewport.Controls.js
@@ -61,6 +61,8 @@ function ViewportControls( editor ) {
 
 	signals.editorCleared.add( function () {
 
+		editor.setViewportCamera( editor.camera.uuid );
+
 		shadingSelect.setValue( 'solid' );
 		editor.setViewportShading( shadingSelect.getValue() );
 
@@ -84,7 +86,13 @@ function ViewportControls( editor ) {
 		}
 
 		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 );
 
 	}