Revision: 36572
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36572
Author: blendix
Date: 2011-05-09 11:02:04 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Cycles: fix node outputs not connect to more than one input.
Modified Paths:
--------------
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_emission.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -38,7 +38,7 @@
};
static bNodeSocketType sh_node_add_closure_out[]= {
- { SOCK_CLOSURE, 1, "Closure", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "Closure", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -32,7 +32,7 @@
/* **************** OUTPUT ******************** */
static bNodeSocketType sh_node_attribute_out[]= {
- { SOCK_VECTOR, 1, "Vector", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Vector", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -38,7 +38,7 @@
};
static bNodeSocketType sh_node_background_out[]= {
- { SOCK_CLOSURE, 1, "Background", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "Background", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
===================================================================
---
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
2011-05-09 10:43:09 UTC (rev 36571)
+++
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType sh_node_bsdf_anisotropic_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -37,7 +37,7 @@
};
static bNodeSocketType sh_node_bsdf_diffuse_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType sh_node_bsdf_glass_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType sh_node_bsdf_glossy_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c
===================================================================
---
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c
2011-05-09 10:43:09 UTC (rev 36571)
+++
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -37,7 +37,7 @@
};
static bNodeSocketType sh_node_bsdf_translucent_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c
===================================================================
---
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c
2011-05-09 10:43:09 UTC (rev 36571)
+++
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -37,7 +37,7 @@
};
static bNodeSocketType sh_node_bsdf_transparent_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType sh_node_bsdf_velvet_out[]= {
- { SOCK_CLOSURE, 1, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "BSDF", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_emission.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_emission.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_emission.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -38,7 +38,7 @@
};
static bNodeSocketType sh_node_emission_out[]= {
- { SOCK_CLOSURE, 1, "Emission", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "Emission", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
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-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -32,13 +32,13 @@
/* **************** OUTPUT ******************** */
static bNodeSocketType sh_node_geometry_out[]= {
- { SOCK_VECTOR, 1, "Position", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VECTOR, 1, "Normal", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { 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, "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},
+ { SOCK_VECTOR, 0, "Position", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Normal", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Tangent", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "True Normal", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Incoming", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Parametric", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Backfacing", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -32,12 +32,12 @@
/* **************** OUTPUT ******************** */
static bNodeSocketType sh_node_light_path_out[]= {
- { SOCK_VALUE, 1, "Is Camera Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VALUE, 1, "Is Shadow Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VALUE, 1, "Is Diffuse Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VALUE, 1, "Is Glossy Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VALUE, 1, "Is Reflection Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_VALUE, 1, "Is Transmission Ray", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Camera Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Shadow Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Diffuse Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Glossy Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Reflection Ray", 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VALUE, 0, "Is Transmission Ray", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType sh_node_mix_closure_out[]= {
- { SOCK_CLOSURE, 1, "Closure", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, "Closure", 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
