瀏覽代碼

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

Emit `history_changed` on merged UndoRedo actions
Yuri Sizov 2 年之前
父節點
當前提交
851bc640dd
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      editor/editor_undo_redo_manager.cpp

+ 2 - 0
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_name == prev_action.action_name && pending_action.action_name == pre_prev_action.action_name) {
 					pending_action = Action();
 					pending_action = Action();
 					is_committing = false;
 					is_committing = false;
+					emit_signal(SNAME("history_changed"));
 					return;
 					return;
 				}
 				}
 			} break;
 			} 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) {
 				if (pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) {
 					pending_action = Action();
 					pending_action = Action();
 					is_committing = false;
 					is_committing = false;
+					emit_signal(SNAME("history_changed"));
 					return;
 					return;
 				}
 				}
 			} break;
 			} break;