Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Patch for bug #28289

Browse Source 
updated the logic behind node delete with reconnect.
When on input and output socket is connected, these two will be reconnected
see bug report for example.

http://projects.blender.org/tracker/?func=detail&aid=28289&group_id=9&atid=498
This commit is contained in:
Jeroen Bakker
2011-08-24 20:48:37 +00:00
parent 7fc26e0123
commit 5f66f37e22
1 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3080,78 +3080,115 @@ void NODE_OT_delete(wmOperatorType *ot)
}
/* ****************** Delete with reconnect ******************* */
static int is_connected_to_input_socket(bNode* node, bNodeLink* link) {
bNodeSocket *sock;
if (link->tonode == node) {
for(sock= node->inputs.first; sock; sock= sock->next) {
if (link->tosock == sock) {
return sock->type;
}
}
}
return -1;
}
/* note: in cmp_util.c is similar code, for node_compo_pass_on() */
/* used for disabling node (similar code in node_draw.c for disable line) */
static void node_delete_reconnect(bNodeTree* tree, bNode* node)
{
bNodeLink *link, *next;
bNodeLink *link, *next, *first = NULL;
bNodeSocket *valsocket= NULL, *colsocket= NULL, *vecsocket= NULL;
bNodeSocket *deliveringvalsocket= NULL, *deliveringcolsocket= NULL, *deliveringvecsocket= NULL;
bNode *deliveringvalnode= NULL, *deliveringcolnode= NULL, *deliveringvecnode= NULL;
bNodeSocket *sock;
int type;
int numberOfConnectedOutputSockets = 0;
int numberOfReconnections = 0;
int numberOfConnectedInputSockets = 0;
/* test the inputs */
for(sock= node->inputs.first; sock; sock= sock->next) {
int type = sock->type;
if(type==SOCK_VALUE && valsocket==NULL) valsocket = sock;
if(type==SOCK_VECTOR && vecsocket==NULL) vecsocket = sock;
if(type==SOCK_RGBA && colsocket==NULL) colsocket = sock;
}
// we now have the input sockets for the 'data types'
// now find the output sockets (and nodes) in the tree that delivers data to these input sockets
/*
test the inputs, not really correct when a node has multiple input sockets of the same type
the first link evaluated will be used to determine the possible connection.
*/
for(link= tree->links.first; link; link=link->next) {
if (valsocket != NULL) {
if (link->tosock == valsocket) {
deliveringvalnode = link->fromnode;
deliveringvalsocket = link->fromsock;
}
}
if (vecsocket != NULL) {
if (link->tosock == vecsocket) {
deliveringvecnode = link->fromnode;
deliveringvecsocket = link->fromsock;
}
}
if (colsocket != NULL) {
if (link->tosock == colsocket) {
if (link->tonode == node) { numberOfConnectedInputSockets++; }
type = is_connected_to_input_socket(node, link);
switch (type) {
case SOCK_RGBA:
if (colsocket == NULL) {
colsocket = link->tosock;
deliveringcolnode = link->fromnode;
deliveringcolsocket = link->fromsock;
}
break;
case SOCK_VECTOR:
if (vecsocket == NULL) {
vecsocket = link->tosock;
deliveringvecnode = link->fromnode;
deliveringvecsocket = link->fromsock;
}
break;
case SOCK_VALUE:
if (valsocket == NULL) {
valsocket = link->tosock;
deliveringvalnode = link->fromnode;
deliveringvalsocket = link->fromsock;
}
break;
default:
break;
}
}
// we now have the sockets+nodes that fill the inputsockets be aware for group nodes these can be NULL
// now make the links for all outputlinks of the node to be reconnected
for(link= tree->links.first; link; link=next) {
next= link->next;
if (link->fromnode == node) {
sock = link->fromsock;
numberOfConnectedOutputSockets ++;
if (!first) first = link;
switch(sock->type) {
case SOCK_VALUE:
if (deliveringvalsocket) {
link->fromnode = deliveringvalnode;
link->fromsock = deliveringvalsocket;
numberOfReconnections++;
}
break;
case SOCK_VECTOR:
if (deliveringvecsocket) {
link->fromnode = deliveringvecnode;
link->fromsock = deliveringvecsocket;
numberOfReconnections++;
}
break;
case SOCK_RGBA:
if (deliveringcolsocket) {
link->fromnode = deliveringcolnode;
link->fromsock = deliveringcolsocket;
numberOfReconnections++;
}
break;
}
}
}
/* when no connections have been made, and if only one delivering input socket type and one output socket we will connect those two */
if (numberOfConnectedOutputSockets == 1 && numberOfReconnections == 0 && numberOfConnectedInputSockets == 1) {
if (deliveringcolsocket) {
first->fromnode = deliveringcolnode;
first->fromsock = deliveringcolsocket;
} else if (deliveringvecsocket) {
first->fromnode = deliveringvecnode;
first->fromsock = deliveringvecsocket;
} else if (deliveringvalsocket) {
first->fromnode = deliveringvalnode;
first->fromsock = deliveringvalsocket;
}
}
if(node->id)
node->id->us--;
nodeFreeNode(tree, node);
}
static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op))