Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2020-05-13 01:14:44 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-05-13 01:14:44 +0300
commitf9d0f59bed4d7fea3622cc01469e225435ad4e56 (patch)
treef0417dd4ded8fa1f5d4a9f43607d1a611757ffff /source/blender/blenkernel
parent75e989dab6c7a5bea9b7f7b406513ffd105a14e2 (diff)
parent50ef801a79b5c280ecd02f89e9a9b4533e4102c4 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_sequencer.h1
-rw-r--r--source/blender/blenkernel/intern/seqprefetch.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 58154006513..f89a2d631ac 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -369,6 +369,7 @@ bool BKE_sequencer_cache_is_full(struct Scene *scene);
* ********************************************************************** */
void BKE_sequencer_prefetch_start(const SeqRenderData *context, float cfra, float cost);
+void BKE_sequencer_prefetch_stop_all();
void BKE_sequencer_prefetch_stop(struct Scene *scene);
void BKE_sequencer_prefetch_free(struct Scene *scene);
bool BKE_sequencer_prefetch_need_redraw(struct Main *bmain, struct Scene *scene);
diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c
index d87c2e1d898..f00d517940a 100644
--- a/source/blender/blenkernel/intern/seqprefetch.c
+++ b/source/blender/blenkernel/intern/seqprefetch.c
@@ -42,6 +42,7 @@
#include "BKE_anim_data.h"
#include "BKE_animsys.h"
#include "BKE_context.h"
+#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
@@ -242,6 +243,14 @@ static void seq_prefetch_update_area(PrefetchJob *pfjob)
}
}
+void BKE_sequencer_prefetch_stop_all(void)
+{
+ /*TODO(Richard): Use wm_jobs for prefetch, or pass main. */
+ for (Scene *scene = G.main->scenes.first; scene; scene = scene->id.next) {
+ BKE_sequencer_prefetch_stop(scene);
+ }
+}
+
/* Use also to update scene and context changes
* This function should almost always be called by cache invalidation, not directly.
*/