archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
source/blender/editors/screen/screen_edit.c
This commit is contained in:
Philipp Oeser
2018-07-06 12:30:48 +02:00
parent dd5c25fab2 3cc2a9b934
commit ccef83b2fb
8 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/intern/wm_jobs.c
View File

@@ -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);
}
}