archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Composite Node bug: the CTRL+SHIFT+Click to make a node connect to

Browse Source 
viewer didn't take hidden sockets in account.
This commit is contained in:
Ton Roosendaal
2010-05-12 17:27:25 +00:00
parent 3c3502fda4
commit 5f6c7ad23d
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/editors/space_node/node_edit.c
View File

@@ -1034,22 +1034,31 @@ static void node_link_viewer(SpaceNode *snode, bNode *tonode)
}
if(node) {
bNodeLink *link;
bNodeSocket *sock;
/* get link to viewer */
for(link= snode->edittree->links.first; link; link= link->next)
if(link->tonode==node)
/* get a good socket to view from */
for(sock= tonode->outputs.first; sock; sock= sock->next)
if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
break;
if(link==NULL) {
nodeAddLink(snode->edittree, tonode, tonode->outputs.first, node, node->inputs.first);
if(sock) {
bNodeLink *link;
/* get link to viewer */
for(link= snode->edittree->links.first; link; link= link->next)
if(link->tonode==node)
break;
if(link==NULL) {
nodeAddLink(snode->edittree, tonode, sock, node, node->inputs.first);
}
else {
link->fromnode= tonode;
link->fromsock= sock;
}
ntreeSolveOrder(snode->edittree);
NodeTagChanged(snode->edittree, node);
}
else {
link->fromnode= tonode;
link->fromsock= tonode->outputs.first;
}
ntreeSolveOrder(snode->edittree);
NodeTagChanged(snode->edittree, node);
}
}