diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-05-13 01:14:44 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-05-13 01:14:44 +0300 |
commit | f9d0f59bed4d7fea3622cc01469e225435ad4e56 (patch) | |
tree | f0417dd4ded8fa1f5d4a9f43607d1a611757ffff /source/blender/windowmanager | |
parent | 75e989dab6c7a5bea9b7f7b406513ffd105a14e2 (diff) | |
parent | 50ef801a79b5c280ecd02f89e9a9b4533e4102c4 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 245a8f28fec..c10f03f3dab 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -35,6 +35,7 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" @@ -558,6 +559,9 @@ void WM_jobs_kill_all(wmWindowManager *wm) while ((wm_job = wm->jobs.first)) { wm_jobs_kill_job(wm, wm_job); } + + /* This job will be automatically restarted */ + BKE_sequencer_prefetch_stop_all(); } /* wait until every job ended, except for one owner (used in undo to keep screen job alive) */ |