diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-02-22 23:24:06 +0300 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2011-02-22 23:24:06 +0300 |
commit | b3c60ef3eae01b08eeb63cb574397f720fc2acbe (patch) | |
tree | f455068835de827635f78d70a9142a041e51ed5e /source/blender/editors/space_node | |
parent | 1f4fc992ef7840931439c161514bff710c6e6dca (diff) |
Added RNA functions to group tree inputs/outputs for exposing internal sockets or adding custom sockets by name and type (fixes #26171). Changed a few function names for groups for consistency.
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 9e93773c271..77337f57765 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -1014,7 +1014,7 @@ static void group_verify_cb(bContext *UNUSED(C), void *UNUSED(snode_v), void *ng { bNodeTree *ngroup= (bNodeTree*)ngroup_v; - nodeVerifyGroup(ngroup); + nodeGroupVerify(ngroup); } /* groups are, on creation, centered around 0,0 */ diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index c0c1b7dc72b..ed13198e129 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -555,7 +555,7 @@ void node_tree_verify_groups(bNodeTree *nodetree) /* does all materials */ if(gnode) - nodeVerifyGroup((bNodeTree *)gnode->id); + nodeGroupVerify((bNodeTree *)gnode->id); } @@ -663,7 +663,7 @@ static int node_group_socket_add_exec(bContext *C, wmOperator *op) else return OPERATOR_CANCELLED; - sock = nodeAddGroupSocket(ngroup, name, type, in_out); + sock = nodeGroupAddSocket(ngroup, name, type, in_out); node_tree_verify_groups(snode->nodetree); @@ -715,7 +715,7 @@ static int node_group_socket_remove_exec(bContext *C, wmOperator *op) sock = (bNodeSocket*)BLI_findlink(in_out==SOCK_IN ? &ngroup->inputs : &ngroup->outputs, index); if (sock) { - nodeRemGroupSocket(ngroup, sock, in_out); + nodeGroupRemoveSocket(ngroup, sock, in_out); node_tree_verify_groups(snode->nodetree); snode_notify(C, snode); @@ -2141,11 +2141,11 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event) else if (outside_group_rect(snode) && (link->tonode || link->fromnode)) { /* automatically add new group socket */ if (link->tonode && link->tosock) { - link->fromsock = nodeAddGroupSocketCopy(snode->edittree, link->tosock, SOCK_IN); + link->fromsock = nodeGroupAddSocket(snode->edittree, link->tosock->name, link->tosock->type, SOCK_IN); link->fromnode = NULL; } else if (link->fromnode && link->fromsock) { - link->tosock = nodeAddGroupSocketCopy(snode->edittree, link->fromsock, SOCK_OUT); + link->tosock = nodeGroupAddSocket(snode->edittree, link->fromsock->name, link->fromsock->type, SOCK_OUT); link->tonode = NULL; } } |