godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #53757 from groud/fix_undo

Browse Source
This commit is contained in:
Rémi Verschelde
2021-10-13 12:42:07 +02:00
committed by GitHub
parent 3e86ca5586 cf7242dd8e
commit 6569635ec0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/object/undo_redo.cpp
View File

@@ -110,15 +110,16 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) {
actions.write[actions.size() - 1].last_tick = ticks; actions.write[actions.size() - 1].last_tick = ticks;
merge_mode = p_mode;
merging = true; merging = true;
} else { } else {
Action new_action; Action new_action;
new_action.name = p_name; new_action.name = p_name;
new_action.last_tick = ticks; new_action.last_tick = ticks;
actions.push_back(new_action); actions.push_back(new_action);
}
merge_mode = p_mode; merge_mode = MERGE_DISABLE;
}
} }
action_level++; action_level++;