seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't print error on empty actions

Browse Source
This commit is contained in:
kobewi
2022-09-13 19:35:25 +02:00
parent f6b36f54e5
commit ae2d07d4ca
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_undo_redo_manager.cpp
View File

@ -124,7 +124,7 @@ void EditorUndoRedoManager::create_action(const String &p_name, UndoRedo::MergeM
create_action_for_history(p_name, INVALID_HISTORY, p_mode); create_action_for_history(p_name, INVALID_HISTORY, p_mode);
if (p_custom_context) { if (p_custom_context) {
// This assigns context to pending action. // This assigns history to pending action.
get_history_for_object(p_custom_context); get_history_for_object(p_custom_context);
} }
} }
@ -218,7 +218,10 @@ void EditorUndoRedoManager::add_undo_reference(Object *p_object) {
} }
void EditorUndoRedoManager::commit_action(bool p_execute) { void EditorUndoRedoManager::commit_action(bool p_execute) {
ERR_FAIL_COND(pending_action.history_id == INVALID_HISTORY); if (pending_action.history_id == INVALID_HISTORY) {
return; // Empty action, do nothing.
}
is_committing = true; is_committing = true;
History &history = get_or_create_history(pending_action.history_id); History &history = get_or_create_history(pending_action.history_id);