[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39721] trunk/blender/source/blender/ blenlib/BLI_utildefines.h: F3TOCHAR4 macro was assigning the same value twice (setting the alpha, then overwriting with 255).

[Campbell Barton]

Revision: 39721
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39721
Author:   campbellbarton
Date:     2011-08-27 01:20:55 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
F3TOCHAR4 macro was assigning the same value twice (setting the alpha, then overwriting with 255).

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h	2011-08-26 22:37:20 UTC (rev 39720)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h	2011-08-27 01:20:55 UTC (rev 39721)
@@ -105,7 +105,7 @@
 #define FTOUSHORT(val) ((val >= 1.0f-0.5f/65535)? 65535: (val <= 0.0f)? 0: (unsigned short)(val*65535.0f + 0.5f))
 #define F3TOCHAR3(v2,v1) (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2]))
 #define F3TOCHAR4(v2,v1) { (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2])); \
-						(v1)[3]=FTOCHAR((v2[3])); (v1)[3] = 255; }
+						(v1)[3] = 255; }
 #define F4TOCHAR4(v2,v1) { (v1)[0]=FTOCHAR((v2[0])); (v1)[1]=FTOCHAR((v2[1])); (v1)[2]=FTOCHAR((v2[2])); \
 						(v1)[3]=FTOCHAR((v2[3])); (v1)[3]=FTOCHAR((v2[3])); }