Merge branch 'blender-v4.0-release'

2023-11-10 14:41:46 +01:00
parent 70074a7d46 c688b03847
commit cb5f650a5a
1 changed files with 4 additions and 0 deletions
--- a/source/blender/sequencer/intern/prefetch.cc
+++ b/source/blender/sequencer/intern/prefetch.cc
@@ -497,6 +497,10 @@ static void *seq_prefetch_frames(void *job)
    ListBase *channels = SEQ_channels_displayed_get(SEQ_editing_get(pfjob->scene_eval));
    if (seq_prefetch_must_skip_frame(pfjob, channels, seqbase)) {
      pfjob->num_frames_prefetched++;
+      /* Break instead of keep looping if the job should be terminated. */
+      if (!(pfjob->scene->ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) || pfjob->stop) {
+        break;
+      }
      continue;
    }