[Bf-blender-cvs] [26b9c502edc] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 26b9c502edced5142e4c2e0151566b31b524bbab
Author: Dalai Felinto
Date:   Thu Mar 29 10:36:34 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB26b9c502edced5142e4c2e0151566b31b524bbab

Merge remote-tracking branch 'origin/master' into blender2.8

Fix for T54437: Sequencer preview uses last updated scene

The fix started in master, moving EvaluationContext initialization
before we leave `deg_evaluate_on_refresh()`.

Upon merging master we can fix the actual issue which was to set
the EvaluationContext depsgraph even if the depsgraph was already updated.

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



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

diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index f3b45303e35,fc71b5ccb7b..1355e68097b
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -228,19 -249,22 +228,19 @@@ static void schedule_children(TaskPool 
   * \note Time sources should be all valid!
   */
  void deg_evaluate_on_refresh(EvaluationContext *eval_ctx,
 -                             Depsgraph *graph,
 -                             const unsigned int layers)
 +                             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;
  	}
 -	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;
  	state.eval_ctx = eval_ctx;