[Bf-blender-cvs] [c4edc6f3f7d] blender-v2.83-release: Fix (unreported): Don't restart prefetching during rendering.

Richard Antalik noreply at git.blender.org
Fri May 22 13:35:20 CEST 2020


Commit: c4edc6f3f7d08eeedb823e3b260bcf883e215286
Author: Richard Antalik
Date:   Fri May 22 13:05:08 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBc4edc6f3f7d08eeedb823e3b260bcf883e215286

Fix (unreported): Don't restart prefetching during rendering.

Prefetching is stopped in BKE_sequencer_cache_cleanup, but is restarted quickly.

Prefetching has negative effect on performance while rendering.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D7751

===================================================================

M	source/blender/blenkernel/intern/seqprefetch.c

===================================================================

diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c
index d2be7653cee..3fe3a0c698e 100644
--- a/source/blender/blenkernel/intern/seqprefetch.c
+++ b/source/blender/blenkernel/intern/seqprefetch.c
@@ -521,10 +521,12 @@ void BKE_sequencer_prefetch_start(const SeqRenderData *context, float cfra, floa
     seq_prefetch_resume(scene);
     /* conditions to start:
      * prefetch enabled, prefetch not running, not scrubbing,
-     * not playing and rendering-expensive footage, cache storage enabled, has strips to render
+     * not playing and rendering-expensive footage, cache storage enabled, has strips to render,
+     * not rendering.
      */
     if ((ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) && !running && !scrubbing &&
-        !(playing && cost > 0.9) && ed->cache_flag & SEQ_CACHE_ALL_TYPES && has_strips) {
+        !(playing && cost > 0.9) && ed->cache_flag & SEQ_CACHE_ALL_TYPES && has_strips &&
+        !G.is_rendering) {
 
       seq_prefetch_start(context, cfra);
     }



More information about the Bf-blender-cvs mailing list