Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Jolly <mistajolly@gmail.com>2022-10-05 15:19:19 +0300
committerCharlie Jolly <mistajolly@gmail.com>2022-10-05 15:19:54 +0300
commit31a4fb42d42af66ce6436803cad6d30173f34245 (patch)
tree60332b4316cc7a37a5c3cb0bb6a1f93d97790f71
parent634e4a49d62c8569020dadf179f6418a68e58ce2 (diff)
Fix T101613: Muted Mix node wrongly connects to Factor socket
T101613: Muting/ctrl+x deleting the new mix node in Float mode passes through the wrong input. Fix by setting no_muted_links() on Factor sockets.
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_mix.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc
index 5ab26100a48..2efd57155b9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mix.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc
@@ -23,11 +23,13 @@ static void sh_node_mix_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Float>(N_("Factor"), "Factor_Float")
+ .no_muted_links()
.default_value(0.5f)
.min(0.0f)
.max(1.0f)
.subtype(PROP_FACTOR);
b.add_input<decl::Vector>(N_("Factor"), "Factor_Vector")
+ .no_muted_links()
.default_value(float3(0.5f))
.subtype(PROP_FACTOR);