mirror of
https://github.com/godotengine/godot.git
synced 2024-11-27 09:16:35 +08:00
Merge pull request #79484 from KoBeWi/history_changes,_but_war․․․_war_never_changes
Emit `history_changed` on merged UndoRedo actions
This commit is contained in:
commit
851bc640dd
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user