diff options
author | Richard Antalik <ISS> | 2019-10-02 23:04:48 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2019-10-02 23:48:39 +0300 |
commit | 2b29bf25fcaa22812a4656c2f4243c037b6b2bb2 (patch) | |
tree | 76298b183981ded45a31aedfff75d4b929103aaf /source/blender/blenkernel/intern/seqcache.c | |
parent | aabd8701e98595bae57d59344ed5d127b8b0f7db (diff) |
Fix T69924: Prefetch stops when moving playhead
Fix T70194: Prefetch freezes Blender in some cases
- Initialize depsgraph in isolated bmain struct.
- Fix prefetching range (forgot in initial prefetch commit).
- Fix crash - Add check if prefetch job is initialized and running.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D5899
Diffstat (limited to 'source/blender/blenkernel/intern/seqcache.c')
-rw-r--r-- | source/blender/blenkernel/intern/seqcache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index d12710690df..ccb1869ee21 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -244,7 +244,8 @@ static SeqCacheKey *seq_cache_choose_key(Scene *scene, SeqCacheKey *lkey, SeqCac * We could use temp cache as a shield and later make it a non-temporary entry, * but it is not worth of increasing system complexity. */ - if (scene->ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) { + if (scene->ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE && + BKE_sequencer_prefetch_job_is_running(scene)) { int pfjob_start, pfjob_end; BKE_sequencer_prefetch_get_time_range(scene, &pfjob_start, &pfjob_end); |