diff options
author | Mike Erwin <significant.bit@gmail.com> | 2016-12-14 00:45:59 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2016-12-14 00:45:59 +0300 |
commit | 1e21b8dc1b26e985385717491cb557fd2e80a7ae (patch) | |
tree | 90257c731ce40d246d925ed40df997cacf4e7d59 /source | |
parent | 0fa887ae35d50e0941df47a01bac457c6109e65a (diff) |
OpenGL: another way to set uniform theme color
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/gpu/GPU_immediate.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 0cb9d7929c9..f601d062d48 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -45,3 +45,4 @@ void immUniformThemeColor(int color_id); void immUniformThemeColorShade(int color_id, int offset); void immUniformThemeColorShadeAlpha(int color_id, int color_offset, int alpha_offset); void immUniformThemeColorBlendShade(int color_id1, int color_id2, float fac, int offset); +void immUniformThemeColorBlend(int color_id1, int color_id2, float fac); diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index 0706c74b7f9..685c31dc3e0 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -64,3 +64,10 @@ void immUniformThemeColorBlendShade(int color_id1, int color_id2, float fac, int UI_GetThemeColorBlendShade4fv(color_id1, color_id2, fac, offset, color); immUniformColor4fv(color); } + +void immUniformThemeColorBlend(int color_id1, int color_id2, float fac) +{ + uint8_t color[3]; + UI_GetThemeColorBlend3ubv(color_id1, color_id2, fac, color); + immUniformColor3ubv(color); +} |