diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-05-24 22:14:23 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-05-24 22:14:23 +0300 |
commit | f13b6875516f8245cd575dbf5cd80e8f9d70b46d (patch) | |
tree | 8e508e56afac4e3788e412ac4c9ab66049f8eaf7 /source/blender/blenkernel/intern/seqprefetch.c | |
parent | 6b8555e01cb127479286f603e3f0b772bd1f416e (diff) | |
parent | 0d0df683d983200dad5f33d0d1b2c8b417d7199f (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/seqprefetch.c')
-rw-r--r-- | source/blender/blenkernel/intern/seqprefetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c index c6ad84f4806..dc75e2b9098 100644 --- a/source/blender/blenkernel/intern/seqprefetch.c +++ b/source/blender/blenkernel/intern/seqprefetch.c @@ -535,11 +535,11 @@ void BKE_sequencer_prefetch_start(const SeqRenderData *context, float cfra, floa /* conditions to start: * prefetch enabled, prefetch not running, not scrubbing, * not playing and rendering-expensive footage, cache storage enabled, has strips to render, - * not rendering. + * not rendering, not doing modal transform - important, see D7820. */ if ((ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) && !running && !scrubbing && !(playing && cost > 0.9) && ed->cache_flag & SEQ_CACHE_ALL_TYPES && has_strips && - !G.is_rendering) { + !G.is_rendering && !G.moving) { seq_prefetch_start(context, cfra); } |