[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44955] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: fix for weightpaint color with recent loopcolor abgr --> rgba conversion.

[Campbell Barton]

Revision: 44955
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44955
Author:   campbellbarton
Date:     2012-03-17 23:26:25 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
fix for weightpaint color with recent loopcolor abgr --> rgba conversion.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-03-17 23:22:44 UTC (rev 44954)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-03-17 23:26:25 UTC (rev 44955)
@@ -917,13 +917,15 @@
 {
 	float colf[4];
 
-	if(coba) do_colorband(coba, input, colf);
-	else     weight_to_rgb(colf, input);
+	if(coba) {
+		do_colorband(coba, input, colf);
+	}
+	else {
+		weight_to_rgb(colf, input);
+	}
 
-	r_col[3] = (unsigned char)(colf[0] * 255.0f);
-	r_col[2] = (unsigned char)(colf[1] * 255.0f);
-	r_col[1] = (unsigned char)(colf[2] * 255.0f);
-	r_col[0] = 255;
+	rgb_float_to_uchar(r_col, colf);
+	r_col[3] = 255; /* really redundant */
 }