griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: another way to set uniform theme color

Browse Source
This commit is contained in:
Mike Erwin
2016-12-13 16:45:59 -05:00
parent 0fa887ae35
commit 1e21b8dc1b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/gpu/GPU_immediate.h
View File

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

7
source/blender/gpu/intern/gpu_immediate.c
View File

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