diff options
Diffstat (limited to 'core/object')
| -rw-r--r-- | core/object/undo_redo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp index 289caf5247..9c84c2add7 100644 --- a/core/object/undo_redo.cpp +++ b/core/object/undo_redo.cpp @@ -110,15 +110,16 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) { actions.write[actions.size() - 1].last_tick = ticks; + merge_mode = p_mode; merging = true; } else { Action new_action; new_action.name = p_name; new_action.last_tick = ticks; actions.push_back(new_action); - } - merge_mode = p_mode; + merge_mode = MERGE_DISABLE; + } } action_level++; |