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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/object/undo_redo.h b/core/object/undo_redo.h
index 389d8714f7..b3a3322e4b 100644
--- a/core/object/undo_redo.h
+++ b/core/object/undo_redo.h
@@ -85,7 +85,7 @@ private:
uint64_t version = 1;
void _pop_history_tail();
- void _process_operation_list(List<Operation>::Element *E);
+ void _process_operation_list(List<Operation>::Element *E, bool p_execute);
void _discard_redo();
bool _redo(bool p_execute);
@@ -131,6 +131,8 @@ public:
bool has_undo() const;
bool has_redo() const;
+ bool is_merging() const;
+
uint64_t get_version() const;
void set_commit_notify_callback(CommitNotifyCallback p_callback, void *p_ud);