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.
This commit is contained in:
commit
26b9c502ed
Notes:
blender-bot
2023-02-14 09:29:42 +01:00
Referenced by issue #54437, Sequencer preview uses last updated scene
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue