godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Control to preferred types 

(cherry picked from commit ec86d32684)

Fix crash by calculating wrong size of array.

(cherry picked from commit 81b6000812)
This commit is contained in:
Stijn Hinlopen 2020-06-29 18:23:49 +02:00 committed by Rémi Verschelde
parent 14b8124074
commit cdb9b51ed1
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/scene_tree_dock.cpp
View File

@ -362,17 +362,26 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (!profile_allow_editing) { if (!profile_allow_editing) {
break; break;
} }
String preferred = "";
// Prefer nodes that inherit from the current scene root.
Node *current_edited_scene_root = EditorNode::get_singleton()->get_edited_scene(); Node *current_edited_scene_root = EditorNode::get_singleton()->get_edited_scene();
if (current_edited_scene_root) { if (current_edited_scene_root) {
String root_class = current_edited_scene_root->get_class_name();
if (ClassDB::is_parent_class(current_edited_scene_root->get_class_name(), "Node2D")) static Vector<String> preferred_types;
preferred = "Node2D"; if (preferred_types.empty()) {
else if (ClassDB::is_parent_class(current_edited_scene_root->get_class_name(), "Spatial")) preferred_types.push_back("Control");
preferred = "Spatial"; preferred_types.push_back("Node2D");
preferred_types.push_back("Node3D");
} }
create_dialog->set_preferred_search_result_type(preferred);
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->popup_create(true); create_dialog->popup_create(true);
} break; } break;
case TOOL_INSTANCE: { case TOOL_INSTANCE: {