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

Merge pull request #27339 from YeldhamDev/undoredo_merge_version

Browse source 
Fix 'UndoRedo' increasing its version on actions that should be merged
This commit is contained in:
Rémi Verschelde 2019-04-05 15:25:36 +02:00 committed by GitHub
commit 4141703b1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/undo_redo.cpp
View file

@ -90,7 +90,7 @@ 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; merge_mode = p_mode;
merging = true;
} else { } else {
Action new_action; Action new_action;
@ -250,6 +250,11 @@ void UndoRedo::commit_action() {
if (action_level > 0) if (action_level > 0)
return; //still nested return; //still nested
if (merging) {
version--;
merging = false;
}
commiting++; commiting++;
redo(); // perform action redo(); // perform action
commiting--; commiting--;
@ -396,6 +401,7 @@ UndoRedo::UndoRedo() {
action_level = 0; action_level = 0;
current_action = -1; current_action = -1;
merge_mode = MERGE_DISABLE; merge_mode = MERGE_DISABLE;
merging = false;
callback = NULL; callback = NULL;
callback_ud = NULL; callback_ud = NULL;

1
core/undo_redo.h
View file

@ -80,6 +80,7 @@ private:
int current_action; int current_action;
int action_level; int action_level;
MergeMode merge_mode; MergeMode merge_mode;
bool merging;
uint64_t version; uint64_t version;
void _pop_history_tail(); void _pop_history_tail();