Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Mar 2018 15:41:37 +0000 (16:41 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Mar 2018 15:41:37 +0000 (16:41 +0100)
1  2 
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/armature_utils.c
source/blender/editors/include/ED_armature.h
source/blender/windowmanager/intern/wm_window.c

index a8fa73654a410f2bab4be5047bd78222eb4abdfe,92518ba73e421892c338e8277f35b7a17e142065..f3b45303e35a59844b975bbc856ba00acde2f3b6
@@@ -234,11 -256,14 +234,12 @@@ void deg_evaluate_on_refresh(Evaluation
        if (BLI_gset_len(graph->entry_tags) == 0) {
                return;
        }
 -      DEG_DEBUG_PRINTF(EVAL, "%s: layers:%u, graph->layers:%u\n",
 -                       __func__,
 -                       layers,
 -                       graph->layers);
        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;