From 38fb8259d0a3773f56224b393b794f004910f3ee Mon Sep 17 00:00:00 2001 From: PrecisionRender Date: Sat, 21 Jan 2023 20:27:04 -0600 Subject: [PATCH] Use selected node type for choosing editor tab Use selected node type for choosing editor tab Update editor/editor_node.cpp Co-authored-by: Tomek --- editor/editor_node.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 05e0c6750e6..19d991b112a 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3653,12 +3653,12 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) { if (get_edited_scene()) { if (current_tab < 2) { - // Use heuristic instead. - int n2d = 0, n3d = 0; - _find_node_types(get_edited_scene(), n2d, n3d); - if (n2d > n3d) { + Node *editor_node = SceneTreeDock::get_singleton()->get_tree_editor()->get_selected(); + editor_node = editor_node == nullptr ? get_edited_scene() : editor_node; + + if (Object::cast_to(editor_node) || Object::cast_to(editor_node)) { editor_select(EDITOR_2D); - } else if (n3d > n2d) { + } else if (Object::cast_to(editor_node)) { editor_select(EDITOR_3D); } }