Fix T60324: node linking UI bugs with some shader nodes.

diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
index bf5f0ec13c506a7a8cbd6ceedd62f3f2883dfc7c..f614667f1767f163610450fc648ccc3de951248f 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
@@ -31,13 +31,13 @@
 
 static bNodeSocketTemplate sh_node_ambient_occlusion_in[] = {
        {       SOCK_RGBA, 1, N_("Color"),              1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
-       {       SOCK_FLOAT, 0, N_("Distance"),  1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Distance"),  1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
        {       SOCK_VECTOR, 1, N_("Normal"),   0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
        {       -1, 0, ""       }
 };
 
 static bNodeSocketTemplate sh_node_ambient_occlusion_out[] = {
-       {       SOCK_RGBA, 1, N_("Color"),      1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+       {       SOCK_RGBA, 0, N_("Color"),      1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
        {       SOCK_FLOAT, 0, N_("AO"),        0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
        {       -1, 0, ""       }
 };

diff --git a/source/blender/nodes/shader/nodes/node_shader_bevel.c b/source/blender/nodes/shader/nodes/node_shader_bevel.c
index 05161bd453afd810a9589363c253ac6f1eb0c5f4..ac97163680730d16e66e9aff8b53bc8761a05c39 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_bevel.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bevel.c
@@ -30,7 +30,7 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bevel_in[] = {
-       {       SOCK_FLOAT, 0, N_("Radius"), 0.05f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Radius"), 0.05f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
        {       SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
        {       -1, 0, ""       }
 };

diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.c b/source/blender/nodes/shader/nodes/node_shader_curves.c
index 243d57339eacaa0569916292ca43e1cd83cd5d75..538c072822a3dffc83823a9c61667b9cb91d737f 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_curves.c
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.c
@@ -35,7 +35,7 @@
 
 /* **************** CURVE VEC  ******************** */
 static bNodeSocketTemplate sh_node_curve_vec_in[] = {
-       {       SOCK_FLOAT, 0, N_("Fac"),       1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+       {       SOCK_FLOAT, 1, N_("Fac"),       1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
        {       SOCK_VECTOR, 1, N_("Vector"),   0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
        {       -1, 0, ""       }
 };

diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.c b/source/blender/nodes/shader/nodes/node_shader_displacement.c
index 4480cbdf56b6ad2930ec75570fd1675c4e17e8b1..5abe226f75e02cde88bfdd6c1ab7374c47bbb93d 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_displacement.c
@@ -30,9 +30,9 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_displacement_in[] = {
-       {       SOCK_FLOAT, 0, N_("Height"), 0.00f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
-       {       SOCK_FLOAT, 0, N_("Midlevel"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
-       {       SOCK_FLOAT, 0, N_("Scale"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Height"), 0.00f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Midlevel"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Scale"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
        {       SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
        {       -1, 0, ""       }
 };

diff --git a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
index f32570eaeaa5d469eb60ce4777a0d59545a78acd..35dd42576b18d56da36a241946f5e2e6f3544fe9 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
+++ b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
@@ -30,8 +30,8 @@
 /* **************** INPUT ********************* */
 
 static bNodeSocketTemplate sh_node_light_falloff_in[] = {
-       {       SOCK_FLOAT, 0, N_("Strength"),                  100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
-       {       SOCK_FLOAT, 0, N_("Smooth"),                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Strength"),                  100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
+       {       SOCK_FLOAT, 1, N_("Smooth"),                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
        {       -1, 0, ""       }
 };
 

diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
index 2a40d98baf90d8e08ee4b407bb983a8f2b62587b..0a892cc6715426ce6202851fb3fadb1da19921a3 100644 (file)
--- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
@@ -30,9 +30,9 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_vector_displacement_in[] = {
-       {       SOCK_RGBA, 0, N_("Vector"), 0.00f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f, PROP_NONE, SOCK_HIDE_VALUE},
-       {       SOCK_FLOAT, 0, N_("Midlevel"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
-       {       SOCK_FLOAT, 0, N_("Scale"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_RGBA, 1, N_("Vector"), 0.00f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f, PROP_NONE, SOCK_HIDE_VALUE},
+       {       SOCK_FLOAT, 1, N_("Midlevel"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+       {       SOCK_FLOAT, 1, N_("Scale"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
        {       -1, 0, ""       }
 };