[Bf-blender-cvs] [4b5f3690bb5] blender2.8: Missed warning in previous commit
Jeroen Bakker
noreply at git.blender.org
Tue Jun 19 14:07:41 CEST 2018
Commit: 4b5f3690bb5758cbc5a3c099632fe6759e020c71
Author: Jeroen Bakker
Date: Tue Jun 19 14:07:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4b5f3690bb5758cbc5a3c099632fe6759e020c71
Missed warning in previous commit
===================================================================
M source/blender/editors/interface/interface_icons.c
M source/blender/windowmanager/WM_api.h
===================================================================
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 6602c4d442e..3d0e74a4023 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -889,7 +889,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
memset(img->rect, 0, size);
di->data.buffer.image = img;
- wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), icon, "StudioLight Icon", 0, WM_JOB_TYPE_ANY);
+ wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), icon, "StudioLight Icon", 0, WM_JOB_TYPE_STUDIOLIGHT);
Icon** tmp = MEM_callocN(sizeof(Icon*), __func__);
*tmp = icon;
WM_jobs_customdata_set(wm_job, tmp, MEM_freeN);
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 267aa448dc3..a2142b2d569 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -520,6 +520,7 @@ enum {
WM_JOB_TYPE_DPAINT_BAKE,
WM_JOB_TYPE_ALEMBIC,
WM_JOB_TYPE_SHADER_COMPILATION,
+ WM_JOB_TYPE_STUDIOLIGHT,
/* add as needed, screencast, seq proxy build
* if having hard coded values is a problem */
};
More information about the Bf-blender-cvs
mailing list