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/depsgraph/intern/depsgraph_eval.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'source/blender/depsgraph/intern/depsgraph_eval.cc') diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 434c3ec7545..ac92d440bbe 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -126,20 +126,18 @@ void DEG_evaluation_context_free(EvaluationContext *eval_ctx) } /* Evaluate all nodes tagged for updating. */ -void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx, - Depsgraph *graph) +void DEG_evaluate_on_refresh(Depsgraph *graph) { DEG::Depsgraph *deg_graph = reinterpret_cast(graph); deg_graph->ctime = BKE_scene_frame_get(deg_graph->scene); /* Update time on primary timesource. */ DEG::TimeSourceDepsNode *tsrc = deg_graph->find_time_source(); tsrc->cfra = deg_graph->ctime; - DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph); + DEG::deg_evaluate_on_refresh(deg_graph); } /* Frame-change happened for root scene that graph belongs to. */ -void DEG_evaluate_on_framechange(EvaluationContext *eval_ctx, - Main *bmain, +void DEG_evaluate_on_framechange(Main *bmain, Depsgraph *graph, float ctime) { @@ -151,7 +149,7 @@ void DEG_evaluate_on_framechange(EvaluationContext *eval_ctx, tsrc->tag_update(deg_graph); DEG::deg_graph_flush_updates(bmain, deg_graph); /* Perform recalculation updates. */ - DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph); + DEG::deg_evaluate_on_refresh(deg_graph); } bool DEG_needs_eval(Depsgraph *graph) -- cgit v1.2.3