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

Merge pull request #78925 from theraot/fix_rename_unique

Browse Source 
Do not change a node unique name to the same name
This commit is contained in:
Rémi Verschelde 2023-07-07 16:04:17 +02:00
commit a2604ff712
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/gui/scene_tree_editor.cpp
View File

@ -1019,11 +1019,18 @@ 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()) {
error->set_text(TTR("Another node already uses this unique name in the scene.")); Node *existing = get_tree()->get_edited_scene_root()->get_node_or_null("%" + new_name);
error->popup_centered(); if (existing == n) {
which->set_text(0, n->get_name()); which->set_text(0, n->get_name());
return; return;
}
if (existing != nullptr) {
error->set_text(TTR("Another node already uses this unique name in the scene."));
error->popup_centered();
which->set_text(0, n->get_name());
return;
}
} }
_rename_node(n, new_name); _rename_node(n, new_name);