[Bf-blender-cvs] [84d70de25a7] master: Fix: Muted curves connect to the Fac socket

Charlie Jolly noreply at git.blender.org
Fri Oct 14 15:23:44 CEST 2022


Commit: 84d70de25a7925521ce49adc2500b09ecbbb5215
Author: Charlie Jolly
Date:   Fri Oct 14 14:21:39 2022 +0100
Branches: master
https://developer.blender.org/rB84d70de25a7925521ce49adc2500b09ecbbb5215

Fix: Muted curves connect to the Fac socket

Resolve by setting no_muted_links() on Factor sockets.

Same issue as T101613

Reviewed By: HooglyBoogly

Differential Revision: https://developer.blender.org/D16153

===================================================================

M	source/blender/nodes/shader/nodes/node_shader_curves.cc

===================================================================

diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc
index 439f2002ebc..c4dbc3ce6f1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_curves.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc
@@ -12,7 +12,12 @@ namespace blender::nodes::node_shader_curves_cc {
 static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b)
 {
   b.is_function_node();
-  b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR);
+  b.add_input<decl::Float>(N_("Fac"))
+      .no_muted_links()
+      .min(0.0f)
+      .max(1.0f)
+      .default_value(1.0f)
+      .subtype(PROP_FACTOR);
   b.add_input<decl::Vector>(N_("Vector")).min(-1.0f).max(1.0f);
   b.add_output<decl::Vector>(N_("Vector"));
 }
@@ -127,7 +132,12 @@ namespace blender::nodes::node_shader_curves_cc {
 static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b)
 {
   b.is_function_node();
-  b.add_input<decl::Float>(N_("Fac")).min(0.0f).max(1.0f).default_value(1.0f).subtype(PROP_FACTOR);
+  b.add_input<decl::Float>(N_("Fac"))
+      .no_muted_links()
+      .min(0.0f)
+      .max(1.0f)
+      .default_value(1.0f)
+      .subtype(PROP_FACTOR);
   b.add_input<decl::Color>(N_("Color")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
   b.add_output<decl::Color>(N_("Color"));
 }
@@ -270,6 +280,7 @@ static void sh_node_curve_float_declare(NodeDeclarationBuilder &b)
 {
   b.is_function_node();
   b.add_input<decl::Float>(N_("Factor"))
+      .no_muted_links()
       .min(0.0f)
       .max(1.0f)
       .default_value(1.0f)



More information about the Bf-blender-cvs mailing list