diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-06 06:00:19 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-06 06:00:19 +0300 |
commit | 4ba5b70d2fba07b3959cb4ce25af0092215f9ae0 (patch) | |
tree | 2bf20a27ddf64ed0e45c6fe9414b607280942bd4 /source/blender/blenkernel/intern/node.c | |
parent | 7ec67dd43d3d9d48dc95bc8c352563975bc91118 (diff) |
Node editor tweaks
* Cleaned up dead code, removed all traces of socket selection
* Modified border select so it's possible to have border select on mouse tweak.
With this change, by default, click+dragging on a node will select and move it,
but click+dragging on empty space will border select.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index b02225bd429..b7991d0c589 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -531,20 +531,6 @@ bNode *nodeMakeGroupFromSelected(bNodeTree *ntree) node->locx-= 0.5f*(min[0]+max[0]); node->locy-= 0.5f*(min[1]+max[1]); - /* set selin and selout of the nodetree */ - for(sock= node->inputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) { - ngroup->selin= sock; - break; - } - } - for(sock= node->outputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) { - ngroup->selout= sock; - break; - } - } - /* set socket own_index to zero since it can still have a value * from being in a group before, otherwise it doesn't get a unique * index in group_verify_own_indices */ @@ -1134,28 +1120,6 @@ bNodeTree *ntreeCopyTree(bNodeTree *ntree, int internal_select) node->flag &= ~(NODE_SELECT|NODE_ACTIVE); nnode->flag |= NODE_SELECT; } - - /* deselect original sockets */ - for(sock= node->inputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) sock->flag&= ~SOCK_SEL; - } - for(sock= node->outputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) sock->flag&= ~SOCK_SEL; - } - - /* set tree selin and selout to new sockets */ - for(sock= nnode->inputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) { - ntree->selin= sock; - break; - } - } - for(sock= nnode->outputs.first; sock; sock= sock->next) { - if(sock->flag & SOCK_SEL) { - ntree->selout= sock; - break; - } - } } if(node==last) break; } |