[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40307] branches/cycles/source/blender/ nodes/shader/nodes: Cycles: fix math nodes not working after merge.

[Brecht Van Lommel]

Revision: 40307
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40307
Author:   blendix
Date:     2011-09-17 20:49:49 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Cycles: fix math nodes not working after merge.

Modified Paths:
--------------
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_vectMath.c

Modified: branches/cycles/source/blender/nodes/shader/nodes/node_shader_math.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_math.c	2011-09-17 18:54:16 UTC (rev 40306)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_math.c	2011-09-17 20:49:49 UTC (rev 40307)
@@ -37,8 +37,8 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate sh_node_math_in[]= { 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, "Value1", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, "Value2", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };
 

Modified: branches/cycles/source/blender/nodes/shader/nodes/node_shader_vectMath.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_vectMath.c	2011-09-17 18:54:16 UTC (rev 40306)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_vectMath.c	2011-09-17 20:49:49 UTC (rev 40307)
@@ -38,8 +38,8 @@
 
 /* **************** VECTOR MATH ******************** */ 
 static bNodeSocketTemplate sh_node_vect_math_in[]= { 
-	{ SOCK_VECTOR, 1, "Vector", 0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f, PROP_NONE}, 
-	{ SOCK_VECTOR, 1, "Vector", 0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f, PROP_NONE}, 
+	{ SOCK_VECTOR, 1, "Vector1", 0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f, PROP_NONE}, 
+	{ SOCK_VECTOR, 1, "Vector2", 0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };