From 2486346f6f0418d90b714119466921ac1da477e4 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 18 Jan 2022 13:06:49 +0100 Subject: Fix T94977: muted link is not ignored in eevee Add a preprocessing step that removes all muted links from the localized node tree. Differential Revision: https://developer.blender.org/D13864 --- source/blender/nodes/shader/node_shader_tree.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source/blender/nodes/shader/node_shader_tree.cc') diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index 8f1bb1dcd9a..5c3c5889c98 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -418,6 +418,22 @@ static void ntree_shader_groups_expand_inputs(bNodeTree *localtree) } } +static void ntree_shader_groups_remove_muted_links(bNodeTree *ntree) +{ + LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { + if (node->type == NODE_GROUP) { + if (node->id != nullptr) { + ntree_shader_groups_remove_muted_links(reinterpret_cast(node->id)); + } + } + } + LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &ntree->links) { + if (link->flag & NODE_LINK_MUTED) { + nodeRemLink(ntree, link); + } + } +} + static void flatten_group_do(bNodeTree *ntree, bNode *gnode) { LinkNode *group_interface_nodes = nullptr; @@ -875,6 +891,7 @@ void ntreeGPUMaterialNodes(bNodeTree *localtree, bNode *output = ntreeShaderOutputNode(localtree, SHD_OUTPUT_EEVEE); + ntree_shader_groups_remove_muted_links(localtree); ntree_shader_groups_expand_inputs(localtree); ntree_shader_groups_flatten(localtree); -- cgit v1.2.3