[Bf-blender-cvs] [b90e2607a09] blender2.8: Depsgraph: Remove workaround for infinite recursion in scene update

Sergey Sharybin noreply at git.blender.org
Wed Oct 25 15:50:43 CEST 2017


Commit: b90e2607a094907cc67dcac8bc3643cd9be6f920
Author: Sergey Sharybin
Date:   Wed Oct 25 15:49:19 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb90e2607a094907cc67dcac8bc3643cd9be6f920

Depsgraph: Remove workaround for infinite recursion in scene update

Was needed for legacy lamp/material drivers.

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 1736e824a94..1e034a27e64 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1603,11 +1603,6 @@ void BKE_scene_graph_update_tagged(EvaluationContext *eval_ctx,
 	prepare_mesh_for_viewport_render(bmain, scene);
 	/* Flush recalc flags to dependencies. */
 	DEG_graph_flush_update(bmain, depsgraph);
-	/* Clear "LIB_TAG_DOIT" flag from all materials, to prevent infinite recursion problems later
-	 * when trying to find materials with drivers that need evaluating [#32017].
-	 */
-	BKE_main_id_tag_idcode(bmain, ID_MA, LIB_TAG_DOIT, false);
-	BKE_main_id_tag_idcode(bmain, ID_LA, LIB_TAG_DOIT, false);
 	/* Update all objects: drivers, matrices, displists, etc. flags set
 	 * by depgraph or manual, no layer check here, gets correct flushed.
 	 */
@@ -1651,11 +1646,6 @@ void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx,
 #ifdef POSE_ANIMATION_WORKAROUND
 	scene_armature_depsgraph_workaround(bmain);
 #endif
-	/* Clear "LIB_TAG_DOIT" flag from all materials, to prevent infinite recursion problems later
-	 * when trying to find materials with drivers that need evaluating [#32017].
-	 */
-	BKE_main_id_tag_idcode(bmain, ID_MA, LIB_TAG_DOIT, false);
-	BKE_main_id_tag_idcode(bmain, ID_LA, LIB_TAG_DOIT, false);
 	/* Update all objects: drivers, matrices, displists, etc. flags set
 	 * by depgraph or manual, no layer check here, gets correct flushed.
 	 */



More information about the Bf-blender-cvs mailing list