diff options
| author | Michael Alexsander Silva Dias <michaelalexsander@protonmail.com> | 2019-03-22 22:06:01 -0300 |
|---|---|---|
| committer | Michael Alexsander Silva Dias <michaelalexsander@protonmail.com> | 2019-04-04 14:37:45 -0300 |
| commit | e63e3875d7c4eb834bee2bb24c49c540cee0a0fd (patch) | |
| tree | 69542de83f65f264db4255daae836d35d1983250 /core/undo_redo.h | |
| parent | 6d2722613476f36c584b69b5b4e9dd88e4be1cec (diff) | |
| download | redot-engine-e63e3875d7c4eb834bee2bb24c49c540cee0a0fd.tar.gz | |
Fix 'UndoRedo' increasing its version on actions that should be merged
Diffstat (limited to 'core/undo_redo.h')
| -rw-r--r-- | core/undo_redo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/undo_redo.h b/core/undo_redo.h index b626149ce6..6293e77acc 100644 --- a/core/undo_redo.h +++ b/core/undo_redo.h @@ -80,6 +80,7 @@ private: int current_action; int action_level; MergeMode merge_mode; + bool merging; uint64_t version; void _pop_history_tail(); |