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

Do not change a node unique name to the same name 

(cherry picked from commit b2bef8c47b)
This commit is contained in:
Alfonso J. Ramos 2023-07-01 19:29:54 -05:00 committed by Yuri Sizov
parent ed9c091a92
commit 8cea540eba
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/gui/scene_tree_editor.cpp
View File

@ -1019,12 +1019,19 @@ void SceneTreeEditor::_renamed() {
} }
} }
if (n->is_unique_name_in_owner() && get_tree()->get_edited_scene_root()->get_node_or_null("%" + new_name) != nullptr) { if (n->is_unique_name_in_owner()) {
Node *existing = get_tree()->get_edited_scene_root()->get_node_or_null("%" + new_name);
if (existing == n) {
which->set_text(0, n->get_name());
return;
}
if (existing != nullptr) {
error->set_text(TTR("Another node already uses this unique name in the scene.")); error->set_text(TTR("Another node already uses this unique name in the scene."));
error->popup_centered(); error->popup_centered();
which->set_text(0, n->get_name()); which->set_text(0, n->get_name());
return; return;
} }
}
_rename_node(n, new_name); _rename_node(n, new_name);
} }