From d325e6f0e845d710abe4847a57be8e30920911a9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 9 Nov 2017 11:20:17 +0100 Subject: Depsgraph: Make dependency graph to be built from scene layer This is a final step of having proper ownership. Now selecting different layers in the "top bar" will actually do what this is expected to do. Surely, there are still things to be done under the hood, that will happen in a less intrusive way. --- source/blender/blenkernel/intern/sequencer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/sequencer.c') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 11c3a5658e8..3e1ebc2a057 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3315,7 +3315,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq /* opengl offscreen render */ context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); ibuf = sequencer_view3d_cb( /* set for OpenGL render (NULL when scrubbing) */ context->eval_ctx, scene, scene_layer, camera, width, height, IB_rect, @@ -3355,7 +3355,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq RE_SetDepsgraph(re, depsgraph); DEG_graph_id_tag_update(context->bmain, depsgraph, &scene->id, 0); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); RE_BlenderFrame(re, context->bmain, scene, NULL, camera, scene->lay, frame, false); /* restore previous state after it was toggled on & off by RE_BlenderFrame */ @@ -3415,7 +3415,7 @@ finally: scene->r.subframe = orig_data.subframe; if (is_frame_update) { - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); } #ifdef DURIAN_CAMERA_SWITCH -- cgit v1.2.3