diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 18:43:15 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 18:43:15 +0300 |
commit | 3701cf785cf58a7c4c517bd217d76738ee28fd6e (patch) | |
tree | 718253603b58816f743037236b83b42adae0f3c4 /source/blender/depsgraph/intern | |
parent | 3c7254ffb65d4f1e07f0b5aaa52b392149226768 (diff) |
Depsgraph; Correct assert for depsgraph scene
We can not do it from builder, since builder will pull set scenes.
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc | 3 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.cc | 3 |
2 files changed, 3 insertions, 3 deletions
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". * |