[Bf-blender-cvs] [1b402433164] blender2.8: Depsgraph: Cleanup, remove depsgraph_legacy from building routines

Sergey Sharybin noreply at git.blender.org
Mon Nov 6 12:40:06 CET 2017


Commit: 1b4024331640cbbfb3b2774e09e02e6527341ab5
Author: Sergey Sharybin
Date:   Fri Nov 3 17:03:33 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB1b4024331640cbbfb3b2774e09e02e6527341ab5

Depsgraph: Cleanup, remove depsgraph_legacy from building routines

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

M	source/blender/depsgraph/intern/depsgraph_build.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index 70799a81835..d58f61a5077 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -52,6 +52,7 @@ extern "C" {
 #include "BKE_collision.h"
 #include "BKE_effect.h"
 #include "BKE_modifier.h"
+#include "BKE_scene.h"
 } /* extern "C" */
 
 #include "DEG_depsgraph.h"
@@ -272,12 +273,12 @@ void DEG_graph_relations_update(Depsgraph *graph, Main *bmain, Scene *scene)
 void DEG_relations_tag_update(Main *bmain)
 {
 	DEG_DEBUG_PRINTF("%s: Tagging relations for update.\n", __func__);
-	for (Scene *scene = (Scene *)bmain->scene.first;
-	     scene != NULL;
-	     scene = (Scene *)scene->id.next)
-	{
-		if (scene->depsgraph_legacy != NULL) {
-			DEG_graph_tag_relations_update(scene->depsgraph_legacy);
+	LINKLIST_FOREACH(Scene *, scene, &bmain->scene) {
+		LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) {
+			Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, scene_layer);
+			if (depsgraph != NULL) {
+				DEG_graph_tag_relations_update(depsgraph);
+			}
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list