diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-07-06 13:30:48 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-07-06 13:30:48 +0300 |
| commit | ccef83b2fb7aeb0653bcc13cfc49dac421ac88c8 (patch) | |
| tree | 2f35f1f83cef51f76d65482702ce3c2ceeae60e7 /source/blender/editors/scene | |
| parent | dd5c25fab205daea5afa7e62d80d56ac17f297fa (diff) | |
| parent | 3cc2a9b934d072fdd817863aa8e93e2416f5c804 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/screen/screen_edit.c
Diffstat (limited to 'source/blender/editors/scene')
| -rw-r--r-- | source/blender/editors/scene/scene_edit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 62933178266..1604abb5c3c 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -97,6 +97,10 @@ bool ED_scene_delete(bContext *C, Main *bmain, wmWindow *win, Scene *scene) { Scene *scene_new; + // kill running jobs + wmWindowManager *wm = bmain->wm.first; + WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_ANY); + if (scene->id.prev) scene_new = scene->id.prev; else if (scene->id.next) |