[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50390] trunk/blender/intern/cycles: Fix for OSL input parameter name mapping.

[Lukas Toenne]

Revision: 50390
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50390
Author:   lukastoenne
Date:     2012-09-04 16:47:00 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Fix for OSL input parameter name mapping. When assigning input constants to shader parameters, use the compatible_name function to strip whitespace.

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

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl	2012-09-04 16:46:56 UTC (rev 50389)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl	2012-09-04 16:47:00 UTC (rev 50390)
@@ -50,12 +50,12 @@
 	float Scale = 5.0,
 	float Distortion = 0.0,
 	float Detail = 2.0,
-	float dscale = 1.0,
+	float DetailScale = 1.0,
 	point Vector = P,
 	output float Fac = 0.0,
 	output color Color = color (0.0, 0.0, 0.0))
 {
-	Fac = wave(Vector, Scale, Type, Detail, Distortion, dscale);
+	Fac = wave(Vector, Scale, Type, Detail, Distortion, DetailScale);
 	Color = color(Fac, Fac, Fac);
 }
 

Modified: trunk/blender/intern/cycles/render/osl.cpp
===================================================================
--- trunk/blender/intern/cycles/render/osl.cpp	2012-09-04 16:46:56 UTC (rev 50389)
+++ trunk/blender/intern/cycles/render/osl.cpp	2012-09-04 16:47:00 UTC (rev 50390)
@@ -200,19 +200,19 @@
 
 			switch(input->type) {
 				case SHADER_SOCKET_COLOR:
-					parameter_color(input->name, input->value);
+					parameter_color(compatible_name(input->name).c_str(), input->value);
 					break;
 				case SHADER_SOCKET_POINT:
-					parameter_point(input->name, input->value);
+					parameter_point(compatible_name(input->name).c_str(), input->value);
 					break;
 				case SHADER_SOCKET_VECTOR:
-					parameter_vector(input->name, input->value);
+					parameter_vector(compatible_name(input->name).c_str(), input->value);
 					break;
 				case SHADER_SOCKET_NORMAL:
-					parameter_normal(input->name, input->value);
+					parameter_normal(compatible_name(input->name).c_str(), input->value);
 					break;
 				case SHADER_SOCKET_FLOAT:
-					parameter(input->name, input->value.x);
+					parameter(compatible_name(input->name).c_str(), input->value.x);
 					break;
 				case SHADER_SOCKET_CLOSURE:
 					break;