griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CTRL+SHIFT click on node "Make viewer connect to node" now also works

Browse Source 
if there's no active viewer, or no existing link to viewer.
This commit is contained in:
Ton Roosendaal
2010-04-14 17:32:28 +00:00
parent a14398c883
commit 3f4a28dcf1
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -950,6 +950,15 @@ static void node_link_viewer(SpaceNode *snode, bNode *tonode)
if( ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER))
if(node->flag & NODE_DO_OUTPUT)
break;
/* no viewer, we make one active */
if(node==NULL) {
for(node= snode->edittree->nodes.first; node; node= node->next) {
if( ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
node->flag |= NODE_DO_OUTPUT;
break;
}
}
}
if(node) {
bNodeLink *link;
@@ -958,8 +967,13 @@ static void node_link_viewer(SpaceNode *snode, bNode *tonode)
for(link= snode->edittree->links.first; link; link= link->next)
if(link->tonode==node)
break;
if(link) {
if(link==NULL) {
nodeAddLink(snode->edittree, tonode, tonode->outputs.first, node, node->inputs.first);
ntreeSolveOrder(snode->edittree);
NodeTagChanged(snode->edittree, node);
}
else if(link) {
link->fromnode= tonode;
link->fromsock= tonode->outputs.first;
NodeTagChanged(snode->edittree, node);