asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow using the 3D editor's View menu while previewing a camera

Browse source 
This is already allowed when using cinematic preview, but not
when previewing a Camera3D the usual way.

Many operations from the View menu still work while previewing
a camera, such as switching between debug draw modes and toggling
information panes.

(cherry picked from commit fab3d136e0)
This commit is contained in:
Hugo Locurcio 2021-07-01 12:43:06 +02:00 committed by Rémi Verschelde
parent 5a66ab1ef4
commit 59c5c04e38
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/spatial_editor_plugin.cpp
View file

@ -3076,14 +3076,12 @@ void SpatialEditorViewport::_toggle_camera_preview(bool p_activate) {
if (!preview) { if (!preview) {
preview_camera->hide(); preview_camera->hide();
} }
view_menu->set_disabled(false);
surface->update(); surface->update();
} else { } else {
previewing = preview; previewing = preview;
previewing->connect("tree_exiting", this, "_preview_exited_scene"); previewing->connect("tree_exiting", this, "_preview_exited_scene");
VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace
view_menu->set_disabled(true);
surface->update(); surface->update();
} }
} }
@ -3316,7 +3314,6 @@ void SpatialEditorViewport::set_state(const Dictionary &p_state) {
previewing = Object::cast_to<Camera>(pv); previewing = Object::cast_to<Camera>(pv);
previewing->connect("tree_exiting", this, "_preview_exited_scene"); previewing->connect("tree_exiting", this, "_preview_exited_scene");
VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), previewing->get_camera()); //replace VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), previewing->get_camera()); //replace
view_menu->set_disabled(true);
surface->update(); surface->update();
preview_camera->set_pressed(true); preview_camera->set_pressed(true);
preview_camera->show(); preview_camera->show();