diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 13:20:17 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 13:20:17 +0300 |
commit | d325e6f0e845d710abe4847a57be8e30920911a9 (patch) | |
tree | 13138d409459bbe7e223833a8f6a5000437585e6 /source/blender/render | |
parent | c99481b6320a77e4793c812403f7d37dfc2d5ced (diff) |
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.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index d7737381c46..608c182bd7b 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5220,7 +5220,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* applies changes fully */ if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))==0) { - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); render_update_anim_renderdata(re, &re->scene->r); } @@ -5392,7 +5392,7 @@ static void database_fromscene_vectors(Render *re, Scene *scene, unsigned int la /* applies changes fully */ scene->r.cfra += timeoffset; - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); /* if no camera, viewmat should have been set! */ if (camera) { diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 28c0c1cbf14..61f59eace89 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -622,7 +622,7 @@ void RE_engine_frame_set(RenderEngine *engine, int frame, float subframe) BPy_BEGIN_ALLOW_THREADS; #endif - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, scene, NULL); #ifdef WITH_PYTHON BPy_END_ALLOW_THREADS; @@ -657,7 +657,7 @@ int RE_engine_render(Render *re, int do_all) /* update animation here so any render layer animation is applied before * creating the render result */ if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0) { - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); render_update_anim_renderdata(re, &re->scene->r); } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index cac17dcd86e..080e68d813e 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1748,7 +1748,7 @@ static void do_render_blur_3d(Render *re) /* make sure motion blur changes get reset to current frame */ if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))==0) { - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); } /* weak... the display callback wants an active renderlayer pointer... */ @@ -2635,7 +2635,7 @@ static void do_render_composite_fields_blur_3d(Render *re) R.i.cfra = re->i.cfra; if (update_newframe) - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); if (re->r.scemode & R_FULL_SAMPLE) do_merge_fullsample(re, ntree); @@ -3700,7 +3700,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri if (nfra != scene->r.cfra) { /* Skip this frame, but update for physics and particles system. */ - BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, bmain, scene); + BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, bmain, scene, NULL); continue; } else |