diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-08-27 21:14:01 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-08-27 21:14:01 +0300 |
| commit | 498583844fb7d0adbbc91d512f98885800cdf46e (patch) | |
| tree | 310002ead2b845b2fd4dc056ea77724e89813be1 /source/blender/editors/interface | |
| parent | 9d3813e602b83c3aa61068e9c592eee4786636af (diff) | |
OpenGL: use new uniform color functions
Color picker code motivated these convenience functions. looks much better now.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index c22a3109a7f..f3c0b7225dd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -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); |