diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-05 14:14:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 14:14:53 +0200 |
| commit | d3c972683542365b1a9bf2d96d20520a8981612d (patch) | |
| tree | b3f230670063f23d73632a7b0fc260ff267c765b /editor | |
| parent | be157c86c519e37ab03677341824d4206ad4fb96 (diff) | |
| parent | fab3d136e0c1f3a3ba2a98dbc1f8cc1568858eee (diff) | |
Merge pull request #50046 from Calinou/editor-camera-preview-allow-view-menu
Allow using the 3D editor's View menu while previewing a camera
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 5a4d79cdc8..78390f0fdf 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -3250,14 +3250,12 @@ void Node3DEditorViewport::_toggle_camera_preview(bool p_activate) { if (!preview) { preview_camera->hide(); } - view_menu->set_disabled(false); surface->update(); } else { previewing = preview; 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 - view_menu->set_disabled(true); surface->update(); } } @@ -3504,7 +3502,6 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) { previewing = Object::cast_to<Camera3D>(pv); 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 - view_menu->set_disabled(true); surface->update(); preview_camera->set_pressed(true); preview_camera->show(); |