diff options
author | Brecht Van Lommel <brecht> | 2020-04-13 18:38:34 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-14 12:07:56 +0300 |
commit | 47084bac9f3c4c95b6fa3e3c3d5b1e661b2bec47 (patch) | |
tree | 9135ce56389ba7a24b3decf3cd13cf1c69179ab6 /source/blender/editors/undo | |
parent | e6d9d5dcc18f3ab55c31abc6bfb2010081538422 (diff) |
Fix T75542: toggling modifier visibility not working correct with undo speedup
The problem was that in direct_link_id_restore_recalc, recalc_undo_accumulated
should contain the changes from the target state to the current state. However
it had already been cleared at that point, to start accumulating changes up to
the next undo push.
Delaying the clear of this flag seems like the obvious solution, but it's hard
to find the right place for that (if there is one). Instead this splits up the
flag into two separate variables.
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D7402
Diffstat (limited to 'source/blender/editors/undo')
-rw-r--r-- | source/blender/editors/undo/memfile_undo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index ebd5b2272b1..9954cf85157 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -234,15 +234,15 @@ static void memfile_undosys_step_decode(struct bContext *C, /* We only start accumulating from this point, any tags set up to here * are already part of the current undo state. This is done in a second * loop because DEG_id_tag_update may set tags on other datablocks. */ - id->recalc_undo_accumulated = 0; + id->recalc_after_undo_push = 0; bNodeTree *nodetree = ntreeFromID(id); if (nodetree != NULL) { - nodetree->id.recalc_undo_accumulated = 0; + nodetree->id.recalc_after_undo_push = 0; } if (GS(id->name) == ID_SCE) { Scene *scene = (Scene *)id; if (scene->master_collection != NULL) { - scene->master_collection->id.recalc_undo_accumulated = 0; + scene->master_collection->id.recalc_after_undo_push = 0; } } } |