archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T76774: Crash on prefetching sequences from another scene.

Browse Source 
When rendering another scene, caching in disabled by setting
local_context.skip_cache = true. Precondition checking for this flag was
missing in BKE_sequencer_cache_get and it wasn't first thing to check in
BKE_sequencer_cache_put.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D7750
This commit is contained in:
Richard Antalik
2020-05-22 12:59:26 +02:00
parent 42f8d52401
commit a1a333a1e9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/seqcache.c
View File

@@ -1217,6 +1217,11 @@ void BKE_sequencer_cache_cleanup_sequence(Scene *scene,
struct ImBuf *BKE_sequencer_cache_get(
const SeqRenderData *context, Sequence *seq, float cfra, int type, bool skip_disk_cache)
{
if (context->skip_cache || context->is_proxy_render || !seq) {
return NULL;
}
Scene *scene = context->scene;
if (context->is_prefetch_render) {
@@ -1314,6 +1319,10 @@ void BKE_sequencer_cache_put(const SeqRenderData *context,
float cost,
bool skip_disk_cache)
{
if (i == NULL || context->skip_cache || context->is_proxy_render || !seq) {
return;
}
Scene *scene = context->scene;
if (context->is_prefetch_render) {
@@ -1322,10 +1331,6 @@ void BKE_sequencer_cache_put(const SeqRenderData *context,
seq = BKE_sequencer_prefetch_get_original_sequence(seq, scene);
}
if (i == NULL || context->skip_cache || context->is_proxy_render || !seq) {
return;
}
/* Prevent reinserting, it breaks cache key linking. */
ImBuf *test = BKE_sequencer_cache_get(context, seq, cfra, type, true);
if (test) {