Merge branch 'blender-v2.91-release'
This commit is contained in:
commit
bf10a56eea
|
@ -2667,6 +2667,9 @@ void DepsgraphRelationBuilder::build_scene_sequencer(Scene *scene)
|
|||
if (scene->ed == nullptr) {
|
||||
return;
|
||||
}
|
||||
if (built_map_.checkIsBuiltAndTag(scene, BuilderMap::TAG_SCENE_SEQUENCER)) {
|
||||
return;
|
||||
}
|
||||
build_scene_audio(scene);
|
||||
ComponentKey scene_audio_key(&scene->id, NodeType::AUDIO);
|
||||
/* Make sure dependencies from sequences data goes to the sequencer evaluation. */
|
||||
|
|
|
@ -319,6 +319,7 @@ static void seq_prefetch_update_scene(Scene *scene)
|
|||
return;
|
||||
}
|
||||
|
||||
pfjob->scene = scene;
|
||||
seq_prefetch_free_depsgraph(pfjob);
|
||||
seq_prefetch_init_depsgraph(pfjob);
|
||||
}
|
||||
|
@ -499,15 +500,14 @@ static PrefetchJob *seq_prefetch_start(const SeqRenderData *context, float cfra)
|
|||
BLI_mutex_init(&pfjob->prefetch_suspend_mutex);
|
||||
BLI_condition_init(&pfjob->prefetch_suspend_cond);
|
||||
|
||||
pfjob->bmain = context->bmain;
|
||||
pfjob->bmain_eval = BKE_main_new();
|
||||
|
||||
pfjob->scene = context->scene;
|
||||
seq_prefetch_init_depsgraph(pfjob);
|
||||
}
|
||||
}
|
||||
seq_prefetch_update_scene(context->scene);
|
||||
seq_prefetch_update_context(context);
|
||||
pfjob->bmain = context->bmain;
|
||||
|
||||
pfjob->cfra = cfra;
|
||||
pfjob->num_frames_prefetched = 1;
|
||||
|
|
|
@ -6045,6 +6045,12 @@ static Sequence *sequencer_check_scene_recursion(Scene *scene, ListBase *seqbase
|
|||
return seq;
|
||||
}
|
||||
|
||||
if (seq->type == SEQ_TYPE_SCENE && (seq->flag & SEQ_SCENE_STRIPS)) {
|
||||
if (sequencer_check_scene_recursion(scene, &seq->scene->ed->seqbase)) {
|
||||
return seq;
|
||||
}
|
||||
}
|
||||
|
||||
if (seq->type == SEQ_TYPE_META && sequencer_check_scene_recursion(scene, &seq->seqbase)) {
|
||||
return seq;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue