diff options
author | Jacques Lucke <jacques@blender.org> | 2022-01-18 15:06:49 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2022-01-18 15:06:49 +0300 |
commit | 2486346f6f0418d90b714119466921ac1da477e4 (patch) | |
tree | 34fd142fe2f813e27c605ec8b98d2b940b2f7e6a /source/blender/nodes/shader | |
parent | 9f8ae130af4082538f5859f39439cf3b6b52873e (diff) |
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
Diffstat (limited to 'source/blender/nodes/shader')
-rw-r--r-- | source/blender/nodes/shader/node_shader_tree.cc | 17 |
1 files changed, 17 insertions, 0 deletions
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<bNodeTree *>(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); |