summaryrefslogtreecommitdiffstats
path: root/core/object/undo_redo.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/object/undo_redo.h')
-rw-r--r--core/object/undo_redo.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/object/undo_redo.h b/core/object/undo_redo.h
index 62aebff877..19d178635c 100644
--- a/core/object/undo_redo.h
+++ b/core/object/undo_redo.h
@@ -84,6 +84,7 @@ private:
MergeMode merge_mode = MERGE_DISABLE;
bool merging = false;
uint64_t version = 1;
+ int merge_total = 0;
void _pop_history_tail();
void _process_operation_list(List<Operation>::Element *E, bool p_execute);