blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Richard Antalik 2020-05-24 21:14:23 +02:00
parent 6b8555e01c 0d0df683d9
commit f13b687551
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/seqprefetch.c
View File

@ -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);
}