blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Alexander Gavrilov 2020-08-05 20:21:08 +03:00
parent 9118df1ecd a316d3b6c6
commit 93f4f96818
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,15 +344,23 @@ static void ntree_shader_unlink_hidden_value_sockets(bNode *group_node, bNodeSoc
bool removed_link = false;
for (node = group_ntree->nodes.first; node; node = node->next) {
const bool is_group = ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP) && (node->id != NULL);
LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) {
if ((sock->flag & SOCK_HIDE_VALUE) == 0) {
if (!is_group && (sock->flag & SOCK_HIDE_VALUE) == 0) {
continue;
}
/* If socket is linked to a group input node and sockets id match. */
if (sock && sock->link && sock->link->fromnode->type == NODE_GROUP_INPUT) {
if (STREQ(isock->identifier, sock->link->fromsock->identifier)) {
nodeRemLink(group_ntree, sock->link);
removed_link = true;
if (is_group) {
/* Recursively unlink sockets within the nested group. */
ntree_shader_unlink_hidden_value_sockets(node, sock);
}
else {
nodeRemLink(group_ntree, sock->link);
removed_link = true;
}
}
}
}