diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2021-05-14 19:18:24 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2021-05-14 19:18:24 +0300 |
commit | 7178e541222038bd27cde4491c747d27ef614301 (patch) | |
tree | 4b44eb91d1300ae8ae13765534c88f92b1b0cdfa /source/blender/nodes | |
parent | 7efe92f63b4bb68bb46edc2fad66282d5acceed6 (diff) | |
parent | d4a36c7ad55b3dfbe5fc52f6183ae26484afa5b9 (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 25e4385de96..5ec982c4e7f 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -564,12 +564,14 @@ static bool ntree_shader_has_displacement(bNodeTree *ntree, /* Non-cycles node is used as an output. */ return false; } + if ((displacement->link != NULL) && !(displacement->link->flag & NODE_LINK_MUTED)) { *r_node = displacement->link->fromnode; *r_socket = displacement->link->fromsock; *r_link = displacement->link; + return true; } - return displacement->link != NULL; + return false; } static void ntree_shader_relink_node_normal(bNodeTree *ntree, |