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/windowmanager | |
| 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/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 3a4195ae1ae..dd9e7edf413 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -500,7 +500,7 @@ void WM_jobs_kill_type(struct wmWindowManager *wm, void *owner, int job_type) next_job = wm_job->next; if (!owner || wm_job->owner == owner) - if (wm_job->job_type == job_type) + if (job_type == WM_JOB_TYPE_ANY || wm_job->job_type == job_type) wm_jobs_kill_job(wm, wm_job); } } |