[Bf-blender-cvs] [18e2a5df1a1] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 18e2a5df1a1d0a279c39f09f00f2c3275748ce60
Author: Sergey Sharybin
Date:   Thu Mar 22 16:41:37 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB18e2a5df1a1d0a279c39f09f00f2c3275748ce60

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index a8fa73654a4,92518ba73e4..f3b45303e35
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -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;