[Bf-blender-cvs] [2b25d8ea30f] blender2.8: Depsgraph: Fix assignment to wrong flags

Sergey Sharybin noreply at git.blender.org
Fri Dec 15 14:43:12 CET 2017


Commit: 2b25d8ea30f261d1a68a24e76e6ad692e8081911
Author: Sergey Sharybin
Date:   Fri Dec 15 14:42:42 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2b25d8ea30f261d1a68a24e76e6ad692e8081911

Depsgraph: Fix assignment to wrong flags

===================================================================

M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index c285efd5819..a839a8beac6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -205,7 +205,7 @@ BLI_INLINE void flush_editors_id_update(Main *bmain,
 		 * This is because DEG_id_tag_update() sets tags on original
 		 * data.
 		 */
-		id_cow->tag |= (id_orig->recalc & ID_RECALC_ALL);
+		id_cow->recalc |= (id_orig->recalc & ID_RECALC_ALL);
 		if (deg_copy_on_write_is_expanded(id_cow)) {
 			deg_editors_id_update(update_ctx, id_cow);
 		}



More information about the Bf-blender-cvs mailing list