From d07f7c8d2516a338547dc4bbd73e17d3b357c8d7 Mon Sep 17 00:00:00 2001 From: reduz Date: Tue, 29 Jun 2021 13:36:32 -0300 Subject: Fixes to 2D viewport * Editor 2D viewport now uses embedded subwindows (windows no longer pop up) * Restored the ability to disable 3D on the 2D viewport (makes 3D not display on 2D when there is a camera on the scene) --- editor/editor_node.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editor') diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 1bc04676b7..31f84d2508 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6116,7 +6116,8 @@ EditorNode::EditorNode() { scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL); scene_root = memnew(SubViewport); - //scene_root->set_usage(Viewport::USAGE_2D); canvas BG mode prevents usage of this as 2D + scene_root->set_embed_subwindows_hint(true); + scene_root->set_disable_3d(true); RenderingServer::get_singleton()->viewport_set_hide_scenario(scene_root->get_viewport_rid(), true); scene_root->set_disable_input(true); -- cgit v1.2.3