blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Depsgraph; Correct assert for depsgraph scene 

We can not do it from builder, since builder will pull set scenes.
This commit is contained in:
Sergey Sharybin 2018-04-18 17:43:15 +02:00
parent 3c7254ffb6
commit 3701cf785c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
View File

@ -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

3
source/blender/depsgraph/intern/depsgraph_build.cc
View File

@ -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".
*