summaryrefslogtreecommitdiff
path: root/core/undo_redo.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/undo_redo.h')
-rw-r--r--core/undo_redo.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/undo_redo.h b/core/undo_redo.h
index 4ee64dbfcf..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();
@@ -94,6 +95,8 @@ private:
MethodNotifyCallback method_callback;
PropertyNotifyCallback property_callback;
+ int commiting;
+
protected:
static void _bind_methods();
@@ -107,6 +110,7 @@ public:
void add_do_reference(Object *p_object);
void add_undo_reference(Object *p_object);
+ bool is_commiting_action() const;
void commit_action();
bool redo();