[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53670] trunk/blender/source/blender/ editors/interface/interface_icons.c: drawing texture icon was multiplying the red channel by alpha, this is almost certainly a typo/accident.

[Campbell Barton]

Revision: 53670
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53670
Author:   campbellbarton
Date:     2013-01-09 03:26:39 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
drawing texture icon was multiplying the red channel by alpha, this is almost certainly a typo/accident.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-09 00:20:48 UTC (rev 53669)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-09 03:26:39 UTC (rev 53670)
@@ -950,8 +950,8 @@
 {
 	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;