diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_undo_redo_manager.cpp | 13 | ||||
| -rw-r--r-- | editor/editor_undo_redo_manager.h | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp index facd1fd6d3..fd2d51be32 100644 --- a/editor/editor_undo_redo_manager.cpp +++ b/editor/editor_undo_redo_manager.cpp @@ -110,13 +110,13 @@ EditorUndoRedoManager::History &EditorUndoRedoManager::get_history_for_object(Ob History &history = get_or_create_history(history_id); if (pending_action.history_id == INVALID_HISTORY) { pending_action.history_id = history_id; - history.undo_redo->create_action(pending_action.action_name, pending_action.merge_mode); + history.undo_redo->create_action(pending_action.action_name, pending_action.merge_mode, pending_action.backward_undo_ops); } return history; } -void EditorUndoRedoManager::create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode) { +void EditorUndoRedoManager::create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode, bool p_backward_undo_ops) { if (pending_action.history_id != INVALID_HISTORY) { // Nested action. p_history_id = pending_action.history_id; @@ -124,17 +124,18 @@ void EditorUndoRedoManager::create_action_for_history(const String &p_name, int pending_action.action_name = p_name; pending_action.timestamp = OS::get_singleton()->get_unix_time(); pending_action.merge_mode = p_mode; + pending_action.backward_undo_ops = p_backward_undo_ops; } if (p_history_id != INVALID_HISTORY) { pending_action.history_id = p_history_id; History &history = get_or_create_history(p_history_id); - history.undo_redo->create_action(pending_action.action_name, pending_action.merge_mode); + history.undo_redo->create_action(pending_action.action_name, pending_action.merge_mode, pending_action.backward_undo_ops); } } -void EditorUndoRedoManager::create_action(const String &p_name, UndoRedo::MergeMode p_mode, Object *p_custom_context) { - create_action_for_history(p_name, INVALID_HISTORY, p_mode); +void EditorUndoRedoManager::create_action(const String &p_name, UndoRedo::MergeMode p_mode, Object *p_custom_context, bool p_backward_undo_ops) { + create_action_for_history(p_name, INVALID_HISTORY, p_mode, p_backward_undo_ops); if (p_custom_context) { // This assigns history to pending action. @@ -487,7 +488,7 @@ EditorUndoRedoManager::History *EditorUndoRedoManager::_get_newest_undo() { } void EditorUndoRedoManager::_bind_methods() { - ClassDB::bind_method(D_METHOD("create_action", "name", "merge_mode", "custom_context"), &EditorUndoRedoManager::create_action, DEFVAL(UndoRedo::MERGE_DISABLE), DEFVAL((Object *)nullptr)); + ClassDB::bind_method(D_METHOD("create_action", "name", "merge_mode", "custom_context", "backward_undo_ops"), &EditorUndoRedoManager::create_action, DEFVAL(UndoRedo::MERGE_DISABLE), DEFVAL((Object *)nullptr), DEFVAL(false)); ClassDB::bind_method(D_METHOD("commit_action", "execute"), &EditorUndoRedoManager::commit_action, DEFVAL(true)); ClassDB::bind_method(D_METHOD("is_committing_action"), &EditorUndoRedoManager::is_committing_action); diff --git a/editor/editor_undo_redo_manager.h b/editor/editor_undo_redo_manager.h index 10daeae807..effa36a87c 100644 --- a/editor/editor_undo_redo_manager.h +++ b/editor/editor_undo_redo_manager.h @@ -52,6 +52,7 @@ public: double timestamp = 0; String action_name; UndoRedo::MergeMode merge_mode = UndoRedo::MERGE_DISABLE; + bool backward_undo_ops = false; }; struct History { @@ -79,8 +80,8 @@ public: int get_history_id_for_object(Object *p_object) const; History &get_history_for_object(Object *p_object); - void create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode = UndoRedo::MERGE_DISABLE); - void create_action(const String &p_name = "", UndoRedo::MergeMode p_mode = UndoRedo::MERGE_DISABLE, Object *p_custom_context = nullptr); + void create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode = UndoRedo::MERGE_DISABLE, bool p_backward_undo_ops = false); + void create_action(const String &p_name = "", UndoRedo::MergeMode p_mode = UndoRedo::MERGE_DISABLE, Object *p_custom_context = nullptr, bool p_backward_undo_ops = false); void add_do_methodp(Object *p_object, const StringName &p_method, const Variant **p_args, int p_argcount); void add_undo_methodp(Object *p_object, const StringName &p_method, const Variant **p_args, int p_argcount); |