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

Merge pull request #26129 from YeldhamDev/undoredo_merge_all_fix 

Fix 'UndoRedo's 'MERGE_ALL' mode repeating instructions when quickly commiting actions
This commit is contained in:
Rémi Verschelde 2019-02-22 09:57:23 +01:00 committed by GitHub
parent 726f31e992 79f1d8b4fb
commit 7e69c160a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/undo_redo.cpp
View File

@ -63,43 +63,37 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) {
_discard_redo();
// Check if the merge operation is valid
if (p_mode != MERGE_DISABLE && actions.size() && actions[actions.size() - 1].name == p_name && actions[actions.size() - 1].last_tick + 800 > ticks) {
if (p_mode == MERGE_ENDS && actions.size() && actions[actions.size() - 1].name == p_name && actions[actions.size() - 1].last_tick + 800 > ticks) {
current_action = actions.size() - 2;
if (p_mode == MERGE_ENDS) {
// Clear all do ops from last action, and delete all object references
List<Operation>::Element *E = actions.write[current_action + 1].do_ops.front();
// Clear all do ops from last action, and delete all object references
List<Operation>::Element *E = actions.write[current_action + 1].do_ops.front();
while (E) {
while (E) {
if (E->get().type == Operation::TYPE_REFERENCE) {
if (E->get().type == Operation::TYPE_REFERENCE) {
Object *obj = ObjectDB::get_instance(E->get().object);
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj)
memdelete(obj);
}
E = E->next();
actions.write[current_action + 1].do_ops.pop_front();
if (obj)
memdelete(obj);
}
E = E->next();
actions.write[current_action + 1].do_ops.pop_front();
}
actions.write[actions.size() - 1].last_tick = ticks;
merge_mode = p_mode;
} else {
Action new_action;
new_action.name = p_name;
new_action.last_tick = ticks;
actions.push_back(new_action);
merge_mode = MERGE_DISABLE;
}
merge_mode = p_mode;
}
action_level++;