From cdb9b51ed1fd4231937f4a0a039b7312534f6fe2 Mon Sep 17 00:00:00 2001 From: Stijn Hinlopen Date: Mon, 29 Jun 2020 18:23:49 +0200 Subject: [PATCH] Add Control to preferred types (cherry picked from commit ec86d3268429eebbf512779bd03df9cd754cea99) Fix crash by calculating wrong size of array. (cherry picked from commit 81b6000812983ee6d113921bc62c47ebd8d5611f) --- editor/scene_tree_dock.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 6880ff59152..8aba7ac40bb 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -362,17 +362,26 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (!profile_allow_editing) { break; } - String preferred = ""; + + // Prefer nodes that inherit from the current scene root. Node *current_edited_scene_root = EditorNode::get_singleton()->get_edited_scene(); - if (current_edited_scene_root) { + String root_class = current_edited_scene_root->get_class_name(); + static Vector preferred_types; + if (preferred_types.empty()) { + preferred_types.push_back("Control"); + preferred_types.push_back("Node2D"); + preferred_types.push_back("Node3D"); + } - if (ClassDB::is_parent_class(current_edited_scene_root->get_class_name(), "Node2D")) - preferred = "Node2D"; - else if (ClassDB::is_parent_class(current_edited_scene_root->get_class_name(), "Spatial")) - preferred = "Spatial"; + for (int i = 0; i < preferred_types.size(); i++) { + if (ClassDB::is_parent_class(root_class, preferred_types[i])) { + create_dialog->set_preferred_search_result_type(preferred_types[i]); + break; + } + } } - create_dialog->set_preferred_search_result_type(preferred); + create_dialog->popup_create(true); } break; case TOOL_INSTANCE: {