asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 6569635ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats 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;
merge_mode = p_mode;
merging = true;
} else {
Action new_action;
new_action.name = p_name;
new_action.last_tick = ticks;
actions.push_back(new_action);
}
merge_mode = p_mode;
merge_mode = MERGE_DISABLE;
}
}
action_level++;