[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52795] trunk/blender/intern/cycles: Fix mapping node min/max not working OSL.

[Brecht Van Lommel]

Revision: 52795
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52795
Author:   blendix
Date:     2012-12-06 09:13:57 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Fix mapping node min/max not working OSL.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_mapping.osl
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/kernel/shaders/node_mapping.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_mapping.osl	2012-12-06 08:10:24 UTC (rev 52794)
+++ trunk/blender/intern/cycles/kernel/shaders/node_mapping.osl	2012-12-06 09:13:57 UTC (rev 52795)
@@ -20,9 +20,17 @@
 
 shader node_mapping(
 	matrix Matrix = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+	point mapping_min = point(0.0, 0.0, 0.0),
+	point mapping_max = point(0.0, 0.0, 0.0),
+	int use_minmax = 0,
 	point VectorIn = point(0.0, 0.0, 0.0),
 	output point VectorOut = point(0.0, 0.0, 0.0))
 {
-	VectorOut = transform(Matrix, VectorIn);
+	point p = transform(Matrix, VectorIn);
+
+	if(use_minmax)
+		p = min(max(mapping_min, p), mapping_max);
+	
+	VectorOut = p;
 }
 

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-12-06 08:10:24 UTC (rev 52794)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-12-06 09:13:57 UTC (rev 52795)
@@ -1098,6 +1098,9 @@
 {
 	Transform tfm = transform_transpose(tex_mapping.compute_transform());
 	compiler.parameter("Matrix", tfm);
+	compiler.parameter_point("mapping_min", tex_mapping.min);
+	compiler.parameter_point("mapping_max", tex_mapping.max);
+	compiler.parameter("use_minmax", tex_mapping.use_minmax);
 
 	compiler.add(this, "node_mapping");
 }