diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-10-28 02:54:55 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-10-28 02:54:55 +0200 |
| commit | d7ebf725c9d83b6694802d18c36bab42b11759c7 (patch) | |
| tree | bb198f368c73e03bd4d6660fbc9f4c2e32cb7846 /editor/editor_undo_redo_manager.cpp | |
| parent | 0486810697f8c22b190dd18e8d72ac18ef0664c3 (diff) | |
| download | redot-engine-d7ebf725c9d83b6694802d18c36bab42b11759c7.tar.gz | |
Fix nested actions in EditorUndoRedoManager
Diffstat (limited to 'editor/editor_undo_redo_manager.cpp')
| -rw-r--r-- | editor/editor_undo_redo_manager.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp index 064448fd96..9c687f4fa4 100644 --- a/editor/editor_undo_redo_manager.cpp +++ b/editor/editor_undo_redo_manager.cpp @@ -109,9 +109,14 @@ EditorUndoRedoManager::History &EditorUndoRedoManager::get_history_for_object(Ob } void EditorUndoRedoManager::create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode) { - pending_action.action_name = p_name; - pending_action.timestamp = OS::get_singleton()->get_unix_time(); - pending_action.merge_mode = p_mode; + if (pending_action.history_id != INVALID_HISTORY) { + // Nested action. + p_history_id = pending_action.history_id; + } else { + pending_action.action_name = p_name; + pending_action.timestamp = OS::get_singleton()->get_unix_time(); + pending_action.merge_mode = p_mode; + } if (p_history_id != INVALID_HISTORY) { pending_action.history_id = p_history_id; @@ -228,6 +233,12 @@ void EditorUndoRedoManager::commit_action(bool p_execute) { history.undo_redo->commit_action(p_execute); history.redo_stack.clear(); + if (history.undo_redo->get_action_level() > 0) { + // Nested action. + is_committing = false; + return; + } + if (!history.undo_stack.is_empty()) { const Action &prev_action = history.undo_stack.back()->get(); if (pending_action.merge_mode != UndoRedo::MERGE_DISABLE && pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) { |