[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44956] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: better not to use rgb_float_to_uchar() from last commit (comment as to why)

Campbell Barton ideasman42 at gmail.com
Sun Mar 18 00:37:23 CET 2012


Revision: 44956
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44956
Author:   campbellbarton
Date:     2012-03-17 23:37:14 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
better not to use rgb_float_to_uchar() from last commit (comment as to why)

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:26:25 UTC (rev 44955)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-03-17 23:37:14 UTC (rev 44956)
@@ -924,8 +924,12 @@
 		weight_to_rgb(colf, input);
 	}
 
-	rgb_float_to_uchar(r_col, colf);
-	r_col[3] = 255; /* really redundant */
+	/* don't use rgb_float_to_uchar() here because
+	 * the resulting float doesn't need 0-1 clamp check */
+	r_col[0] = (unsigned char)(colf[0] * 255.0f);
+	r_col[1] = (unsigned char)(colf[1] * 255.0f);
+	r_col[2] = (unsigned char)(colf[2] * 255.0f);
+	r_col[3] = 255;
 }
 
 




More information about the Bf-blender-cvs mailing list