diff options
Diffstat (limited to 'core/undo_redo.h')
| -rw-r--r-- | core/undo_redo.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/undo_redo.h b/core/undo_redo.h index f09fca9a78..e2cc6c659b 100644 --- a/core/undo_redo.h +++ b/core/undo_redo.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -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 committing; + 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_committing_action() const; void commit_action(); bool redo(); |