diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-09 07:26:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-09 07:26:39 +0400 |
| commit | 73ead0b207ec5b34ada98230487e9b35852fb7d0 (patch) | |
| tree | 4d041609b688c80e37a07d8c515ecfdfe7bd7f80 /source/blender | |
| parent | f5317b5f0c553801362a371ad18739d1ff2820cc (diff) | |
drawing texture icon was multiplying the red channel by alpha, this is almost certainly a typo/accident.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ebc80d61af3..68780083b97 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -950,8 +950,8 @@ static void icon_draw_texture(float x, float y, float w, float h, int ix, int iy { float x1, x2, y1, y2; - if (rgb) glColor4f(alpha*rgb[0], rgb[1], rgb[2], alpha); - else glColor4f(alpha, alpha, alpha, alpha); + if (rgb) glColor4f(rgb[0], rgb[1], rgb[2], alpha); + else glColor4f(alpha, alpha, alpha, alpha); x1 = ix * icongltex.invw; x2 = (ix + ih) * icongltex.invw; |