diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-05-12 23:50:33 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-05-13 00:13:18 +0300 |
| commit | be69f23b687ac0698fb95a28d007ee2e6b1b4eb5 (patch) | |
| tree | 879805ea8479eb16bf15f1036d1c7b8d3cce7061 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 4930eb15f72cff2be0591ac473fa6560430a296b (diff) | |
Fix T70612: Sequencer Crash on enabling Prefetch
Disable (skip) preftching scene strips if they target 3D scene.
Try to continue prefetching complete frame if disk cache images are found.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D7514
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 6791424694a..53357546669 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1538,7 +1538,10 @@ static bool video_seq_is_rendered(Sequence *seq) return (seq && !(seq->flag & SEQ_MUTE) && seq->type != SEQ_TYPE_SOUND_RAM); } -static int get_shown_sequences(ListBase *seqbasep, int cfra, int chanshown, Sequence **seq_arr_out) +int BKE_sequencer_get_shown_sequences(ListBase *seqbasep, + int cfra, + int chanshown, + Sequence **seq_arr_out) { Sequence *seq_arr[MAXSEQ + 1]; int b = chanshown; @@ -3973,7 +3976,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ImBuf *out = NULL; clock_t begin; - count = get_shown_sequences(seqbasep, cfra, chanshown, (Sequence **)&seq_arr); + count = BKE_sequencer_get_shown_sequences(seqbasep, cfra, chanshown, (Sequence **)&seq_arr); if (count == 0) { return NULL; @@ -4081,7 +4084,7 @@ ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int cha Sequence *seq_arr[MAXSEQ + 1]; int count; - count = get_shown_sequences(seqbasep, cfra, chanshown, seq_arr); + count = BKE_sequencer_get_shown_sequences(seqbasep, cfra, chanshown, seq_arr); if (count) { out = BKE_sequencer_cache_get( |