blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Philipp Oeser 2021-05-14 18:18:24 +02:00
parent 7efe92f63b d4a36c7ad5
commit 7178e54122
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/shader/node_shader_tree.c
View File

@ -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,