godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-08 00:25:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79484 from KoBeWi/history_changes,_but_war․․․_war_never_changes

Browse Source 
Emit `history_changed` on merged UndoRedo actions
This commit is contained in:
Yuri Sizov
2023-07-16 14:42:55 +02:00
committed by GitHub
parent 7bc8a52edf b6bb0d505d
commit 851bc640dd
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_undo_redo_manager.cpp
View File

@@ -264,6 +264,7 @@ void EditorUndoRedoManager::commit_action(bool p_execute) {
pending_action.action_name == prev_action.action_name && pending_action.action_name == pre_prev_action.action_name) {
pending_action = Action();
is_committing = false;
emit_signal(SNAME("history_changed"));
return;
}
} break;
@@ -272,6 +273,7 @@ void EditorUndoRedoManager::commit_action(bool p_execute) {
if (pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) {
pending_action = Action();
is_committing = false;
emit_signal(SNAME("history_changed"));
return;
}
} break;