[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52762] trunk/blender/intern/cycles/kernel /shaders/node_mix.osl: FIX: OSL mix shader clamps 2nd color component to 3rd one.

Konrad Kleine konrad.wilhelm.kleine at gmail.com
Tue Dec 4 09:40:28 CET 2012


Revision: 52762
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52762
Author:   kwk
Date:     2012-12-04 08:40:24 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
FIX: OSL mix shader clamps 2nd color component to 3rd one.

Previously the OSL Mix shader node was clamping the 2nd color component (green) to the 3rd color component (blue). Now every component is clamped on its own.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_mix.osl

Modified: trunk/blender/intern/cycles/kernel/shaders/node_mix.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_mix.osl	2012-12-04 08:10:53 UTC (rev 52761)
+++ trunk/blender/intern/cycles/kernel/shaders/node_mix.osl	2012-12-04 08:40:24 UTC (rev 52762)
@@ -272,7 +272,7 @@
 	color outcol = col;
 
 	outcol[0] = clamp(col[0], 0.0, 1.0);
-	outcol[1] = clamp(col[2], 0.0, 1.0);
+	outcol[1] = clamp(col[1], 0.0, 1.0);
 	outcol[2] = clamp(col[2], 0.0, 1.0);
 
 	return outcol;




More information about the Bf-blender-cvs mailing list