[Bf-blender-cvs] [3701cf785cf] blender2.8: Depsgraph; Correct assert for depsgraph scene

[Sergey Sharybin]

Commit: 3701cf785cf58a7c4c517bd217d76738ee28fd6e
Author: Sergey Sharybin
Date:   Wed Apr 18 17:43:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3701cf785cf58a7c4c517bd217d76738ee28fd6e

Depsgraph; Correct assert for depsgraph scene

We can not do it from builder, since builder will pull set scenes.

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

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

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 85f465efb82..c97fa3b3a5a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -126,9 +126,6 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la
 		ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set);
 		build_view_layer(scene->set, set_view_layer);
 	}
-
-	BLI_assert(graph_->scene == scene);
-	BLI_assert(graph_->view_layer == view_layer);
 }
 
 }  // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index f071fd04c5e..ecd3d5361f8 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -206,6 +206,9 @@ void DEG_graph_build_from_view_layer(Depsgraph *graph,
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
 	BLI_assert(BLI_findindex(&scene->view_layers, view_layer) != -1);
 
+	BLI_assert(deg_graph->scene == scene);
+	BLI_assert(deg_graph->view_layer == view_layer);
+
 	/* TODO(sergey): This is a bit tricky, but ensures that all the data
 	 * is evaluated properly when depsgraph is becoming "visible".
 	 *