diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-05-09 04:46:51 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-05-09 05:56:50 +0400 |
| commit | 20c90eae147f359b84a51a47846588e9b28cbc6f (patch) | |
| tree | d9545072982b0c59131fd9eedac7ba61ed38732b /source/blender/editors/interface/interface_templates.c | |
| parent | d1cf35069dd7baa2f655092875ec36a55cfcc501 (diff) | |
Bake API: renaming WM_JOB_RENDER_BAKE to WM_JOB_OBJECT_BAKE and use it consistently
Note: that doesnt change much. It definitively doesnt change the random crash OSX is experiencing sometimes.
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 961c2d033d9..907e208164e 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -3290,7 +3290,8 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C) handle_event = B_STOPCOMPO; break; } - else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE)) { + else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE) || + WM_jobs_test(wm, scene, WM_JOB_TYPE_OBJECT_BAKE)) { /* Skip bake jobs in compositor to avoid compo header displaying * progress bar which is not being updated (bake jobs only need * to update NC_IMAGE context. |