From a1e2415ed51e2da97e3b182f18f462345a02ce14 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Apr 2018 11:21:20 +0200 Subject: Depsgraph: don't pass evaluation context to update functions. The depsgraph now contains all the state needed to evaluate it. Differential Revision: https://developer.blender.org/D3147 --- source/blender/blenkernel/intern/anim.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/anim.c') diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 62df97c6afa..0b964145c7f 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -278,8 +278,6 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets) /* update scene for current frame */ static void motionpaths_calc_update_scene(Main *bmain, - Scene *scene, - ViewLayer *view_layer, struct Depsgraph *depsgraph) { /* Do all updates @@ -292,7 +290,7 @@ static void motionpaths_calc_update_scene(Main *bmain, * * TODO(sergey): Use evaluation context dedicated to motion paths. */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); + BKE_scene_graph_update_for_newframe(depsgraph, bmain); } /* ........ */ @@ -369,7 +367,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* calculate path over requested range */ for (CFRA = sfra; CFRA <= efra; CFRA++) { /* update relevant data for new frame */ - motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, eval_ctx->depsgraph); /* perform baking for targets */ motionpaths_calc_bake_targets(scene, targets); @@ -377,7 +375,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* reset original environment */ CFRA = cfra; - motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, eval_ctx->depsgraph); /* clear recalc flags from targets */ for (mpt = targets->first; mpt; mpt = mpt->next) { -- cgit v1.2.3