[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36488] branches/cycles: Cycles: rename UV geometry node output to Parametric to avoid confusion with uv texture coordinates .

[Brecht Van Lommel]

Revision: 36488
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36488
Author:   blendix
Date:     2011-05-04 15:22:15 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Cycles: rename UV geometry node output to Parametric to avoid confusion with uv texture coordinates.

Modified Paths:
--------------
    branches/cycles/intern/cycles/kernel/osl/nodes/node_geometry.osl
    branches/cycles/intern/cycles/render/nodes.cpp
    branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c

Modified: branches/cycles/intern/cycles/kernel/osl/nodes/node_geometry.osl
===================================================================
--- branches/cycles/intern/cycles/kernel/osl/nodes/node_geometry.osl	2011-05-04 15:09:48 UTC (rev 36487)
+++ branches/cycles/intern/cycles/kernel/osl/nodes/node_geometry.osl	2011-05-04 15:22:15 UTC (rev 36488)
@@ -27,7 +27,7 @@
 	output normal Tangent = normal(0.0, 0.0, 0.0),
 	output normal TrueNormal = normal(0.0, 0.0, 0.0),
 	output vector Incoming = vector(0.0, 0.0, 0.0),
-	output point UV = point(0.0, 0.0, 0.0),
+	output point Parametric = point(0.0, 0.0, 0.0),
 	output float Backfacing = 0.0)
 {
 	Position = P;
@@ -35,16 +35,16 @@
 	Tangent = normalize(dPdu);
 	TrueNormal = Ng;
 	Incoming = I;
-	UV = point(u, v, 0.0);
+	Parametric = point(u, v, 0.0);
 	Backfacing = backfacing();
 
 	if(bump_offset == "dx") {
 		Position += Dx(Position);
-		UV += Dx(UV);
+		Parametric += Dx(Parametric);
 	}
 	else if(bump_offset == "dy") {
 		Position += Dy(Position);
-		UV += Dy(UV);
+		Parametric += Dy(Parametric);
 	}
 }
 

Modified: branches/cycles/intern/cycles/render/nodes.cpp
===================================================================
--- branches/cycles/intern/cycles/render/nodes.cpp	2011-05-04 15:09:48 UTC (rev 36487)
+++ branches/cycles/intern/cycles/render/nodes.cpp	2011-05-04 15:22:15 UTC (rev 36488)
@@ -1251,7 +1251,7 @@
 	add_output("Tangent", SHADER_SOCKET_NORMAL);
 	add_output("True Normal", SHADER_SOCKET_NORMAL);
 	add_output("Incoming", SHADER_SOCKET_VECTOR);
-	add_output("UV", SHADER_SOCKET_POINT);
+	add_output("Parametric", SHADER_SOCKET_POINT);
 	add_output("Backfacing", SHADER_SOCKET_FLOAT);
 }
 
@@ -1295,7 +1295,7 @@
 		compiler.add_node(geom_node, NODE_GEOM_I, out->stack_offset);
 	}
 
-	out = output("UV");
+	out = output("Parametric");
 	if(!out->links.empty()) {
 		compiler.stack_assign(out);
 		compiler.add_node(geom_node, NODE_GEOM_uv, out->stack_offset);

Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c	2011-05-04 15:09:48 UTC (rev 36487)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c	2011-05-04 15:22:15 UTC (rev 36488)
@@ -37,7 +37,7 @@
 	{	SOCK_VECTOR, 1, "Tangent",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	SOCK_VECTOR, 1, "True Normal",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	SOCK_VECTOR, 1, "Incoming",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 1, "UV",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 1, "Parametric",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE,  1, "Backfacing",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };