godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #67590 from cooperra/rename-node-undoredo-context-fix 

Have the Rename Node action use the targeted Node for undo/redo context
This commit is contained in:
Yuri Sizov 2023-03-15 16:32:45 +01:00 committed by GitHub
parent f08ffdc372 907ba0d8f2
commit eada333a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/scene_tree_editor.cpp
View File

@ -1016,7 +1016,7 @@ void SceneTreeEditor::_renamed() {
emit_signal(SNAME("node_renamed")); emit_signal(SNAME("node_renamed"));
} else { } else {
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Rename Node")); undo_redo->create_action(TTR("Rename Node"), UndoRedo::MERGE_DISABLE, n);
emit_signal(SNAME("node_prerename"), n, new_name); emit_signal(SNAME("node_prerename"), n, new_name);
undo_redo->add_do_method(this, "_rename_node", n->get_instance_id(), new_name); undo_redo->add_do_method(this, "_rename_node", n->get_instance_id(), new_name);
undo_redo->add_undo_method(this, "_rename_node", n->get_instance_id(), n->get_name()); undo_redo->add_undo_method(this, "_rename_node", n->get_instance_id(), n->get_name());