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

Merge pull request #50046 from Calinou/editor-camera-preview-allow-view-menu

Browse source 
Allow using the 3D editor's View menu while previewing a camera
This commit is contained in:
Rémi Verschelde 2021-07-05 14:14:53 +02:00 committed by GitHub
commit d3c9726835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/node_3d_editor_plugin.cpp
View file

@ -3250,14 +3250,12 @@ void Node3DEditorViewport::_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", callable_mp(this, &Node3DEditorViewport::_preview_exited_scene)); previewing->connect("tree_exiting", callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
RS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace RS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace
view_menu->set_disabled(true);
surface->update(); surface->update();
} }
} }
@ -3504,7 +3502,6 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
previewing = Object::cast_to<Camera3D>(pv); previewing = Object::cast_to<Camera3D>(pv);
previewing->connect("tree_exiting", callable_mp(this, &Node3DEditorViewport::_preview_exited_scene)); previewing->connect("tree_exiting", callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
RS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), previewing->get_camera()); //replace RS::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();