Commit: c88fd817d326aae372a320fd6945b132cd558706
Author: Dalai Felinto
Date: Thu Feb 22 08:32:06 2018 -0300
Branches: temp-render-depsgraph
https://developer.blender.org/rBc88fd817d326aae372a320fd6945b132cd558706
>From review: Avoid chicken-egg situation with EvaluationContext/Depsgraph
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 6f6521284e9..899a911270f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1445,7 +1445,6 @@ void BKE_scene_graph_update_tagged(EvaluationContext
*eval_ctx,
}
/* applies changes right away, does all sets too */
-/* TODO (dfelinto/sergey) make a function that updates all render
context/depsgraphs at once. */
void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx,
Depsgraph *depsgraph,
Main *bmain,
@@ -1454,7 +1453,7 @@ void
BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx,
{
/* TODO(sergey): Temporary solution for until pipeline.c is ported. */
if (view_layer == NULL) {
- view_layer = DEG_get_evaluated_view_layer(eval_ctx->depsgraph);
+ view_layer = DEG_get_evaluated_view_layer(depsgraph);
BLI_assert(view_layer != NULL);
}
/* TODO(sergey): Some functions here are changing global state,
@@ -1468,7 +1467,7 @@ void
BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx,
*/
BKE_image_update_frame(bmain, scene->r.cfra);
BKE_sound_set_cfra(scene->r.cfra);
- DEG_graph_relations_update(eval_ctx->depsgraph, bmain, scene,
view_layer);
+ DEG_graph_relations_update(depsgraph, bmain, scene, view_layer);
/* Update animated cache files for modifiers.
*
* TODO(sergey): Make this a depsgraph node?
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
