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

…_never_changes Emit `history_changed` on merged UndoRedo actions
godotengine · Jul 16, 2023 · 851bc64 · 851bc64
2 parents 7bc8a52 + b6bb0d5
commit 851bc64
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp
@@ -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;