diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-15 20:36:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-15 20:43:33 +0300 |
commit | db3bfd0633ae5d3a5458fed7cca7849b86525002 (patch) | |
tree | 7f9664b4f1e4212a205d99898b3aefded9a464e1 /source/blender/depsgraph/intern/eval/deg_eval_flush.cc | |
parent | 2f60b505c6fe14d04cb15479dfad8c47e32c8e9f (diff) |
Fix T61575: missing Cycles viewport updates when changing settings.
This reverts "Depsgraph: Don't tag original IDs", commit:
5f814cb3b47df9255724e979458e05a42ed40f9a.
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_flush.cc')
-rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_flush.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 351e6901015..e408314a340 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -248,6 +248,10 @@ void flush_editors_id_update(Main *bmain, /* TODO(sergey): Do we need to pass original or evaluated ID here? */ ID *id_orig = id_node->id_orig; ID *id_cow = id_node->id_cow; + /* Copy tag from original data to CoW storage. + * This is because DEG_id_tag_update() sets tags on original + * data. */ + id_cow->recalc |= (id_orig->recalc & ID_RECALC_ALL); /* Gather recalc flags from all changed components. */ GHASH_FOREACH_BEGIN(ComponentNode *, comp_node, id_node->components) { |