Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Editor: Fixed ghost viewport camera #28277

Merged
merged 3 commits into from
May 6, 2024
Merged

Editor: Fixed ghost viewport camera #28277

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c55311
fixed viewport camera selector
ycw May 4, 2024
0ad3494
set viewport camera to editor.camera
ycw May 6, 2024
9f1a4b7
uses editor.camera as default camera
ycw May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion editor/js/Viewport.Controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ function ViewportControls( editor ) {

signals.editorCleared.add( function () {

editor.setViewportCamera( editor.camera.uuid );

shadingSelect.setValue( 'solid' );
editor.setViewportShading( shadingSelect.getValue() );

Expand All @@ -84,7 +86,13 @@ function ViewportControls( editor ) {
}

cameraSelect.setOptions( options );
cameraSelect.setValue( editor.viewportCamera.uuid );

const selectedCamera = ( editor.viewportCamera.uuid in options )
? editor.viewportCamera
: Object.values( editor.cameras )[ 0 ];
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved

cameraSelect.setValue( selectedCamera.uuid );
editor.setViewportCamera( selectedCamera.uuid );

}

Expand Down