blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

OpenGL: use new uniform color functions 

Color picker code motivated these convenience functions. looks much better now.
This commit is contained in:
Mike Erwin 2016-08-27 14:14:01 -04:00
parent 9d3813e602
commit 498583844f
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface_widgets.c
View File

@ -2343,12 +2343,7 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti *
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
const float scale = 1.0f / 255.0f; /* TODO: treat as sRGB? */
const float outline_r = scale * (unsigned char)wcol->outline[0];
const float outline_g = scale * (unsigned char)wcol->outline[1];
const float outline_b = scale * (unsigned char)wcol->outline[2];
immUniform4f("color", outline_r, outline_g, outline_b, 1.0f);
immUniformColor3ubv(wcol->outline);
imm_draw_lined_circle(pos, centx, centy, radius, tot);
glDisable(GL_BLEND);

6
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -746,9 +746,9 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d)
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
float crosshair_color[3];
UI_GetThemeColor3fv(TH_VIEW_OVERLAY, crosshair_color);
immUniform4f("color", crosshair_color[0], crosshair_color[1], crosshair_color[2], 1.0f);
unsigned char crosshair_color[3];
UI_GetThemeColor3ubv(TH_VIEW_OVERLAY, crosshair_color);
immUniformColor3ubv(crosshair_color);
immBegin(GL_LINES, 8);
immVertex2f(pos, co[0] - f20, co[1]);