Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / eval / deg_eval.cc
index f3b45303e35a59844b975bbc856ba00acde2f3b6..1355e68097b4b65e2ba70cccfffd1d502e0cd3c0 100644 (file)
@@ -230,17 +230,17 @@ static void schedule_children(TaskPool *pool,
 void deg_evaluate_on_refresh(EvaluationContext *eval_ctx,
                              Depsgraph *graph)
 {
+       /* Set time for the current graph evaluation context. */
+       TimeSourceDepsNode *time_src = graph->find_time_source();
+       eval_ctx->ctime = time_src->cfra;
+       eval_ctx->depsgraph = (::Depsgraph *)graph;
+       eval_ctx->view_layer = DEG_get_evaluated_view_layer((::Depsgraph *)graph);
        /* Nothing to update, early out. */
        if (BLI_gset_len(graph->entry_tags) == 0) {
                return;
        }
        const bool do_time_debug = ((G.debug & G_DEBUG_DEPSGRAPH_TIME) != 0);
        const double start_time = do_time_debug ? PIL_check_seconds_timer() : 0;
-       /* Set time for the current graph evaluation context. */
-       TimeSourceDepsNode *time_src = graph->find_time_source();
-       eval_ctx->depsgraph = (::Depsgraph *)graph;
-       eval_ctx->view_layer = DEG_get_evaluated_view_layer((::Depsgraph *)graph);
-       eval_ctx->ctime = time_src->cfra;
        /* Set up evaluation context for depsgraph itself. */
        DepsgraphEvalState state;
        state.eval_ctx = eval_ctx;