diff options
author | Hans Goudey <h.goudey@me.com> | 2021-12-10 23:54:32 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-12-10 23:54:32 +0300 |
commit | a8b730e04c658ec72ad22974eb1c3d2493308f44 (patch) | |
tree | fd32e7707e3a034ee60307f630b77da5b3ce8870 /source/blender/nodes/intern/node_common.cc | |
parent | 7c2fb00e661e080f0d0c85df60f1dff481c91d5e (diff) |
Cleanup: Use const argument, rename variables
The const argument makes sense because these are the "source"
sockets, even though a const cast is necessary at one point.
The name "interface_socket" is an improvement over "stemp"
because the latter sounds like "temporary", or it confuses
the old socket template system with a node group's interface.
Diffstat (limited to 'source/blender/nodes/intern/node_common.cc')
-rw-r--r-- | source/blender/nodes/intern/node_common.cc | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc index 9b5436bccfb..f7068782dbf 100644 --- a/source/blender/nodes/intern/node_common.cc +++ b/source/blender/nodes/intern/node_common.cc @@ -123,39 +123,46 @@ bool nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree, const char **r_dis /* used for both group nodes and interface nodes */ static bNodeSocket *group_verify_socket(bNodeTree *ntree, bNode *gnode, - bNodeSocket *iosock, + const bNodeSocket *interface_socket, ListBase *verify_lb, eNodeSocketInOut in_out) { bNodeSocket *sock; for (sock = (bNodeSocket *)verify_lb->first; sock; sock = sock->next) { - if (STREQ(sock->identifier, iosock->identifier)) { + if (STREQ(sock->identifier, interface_socket->identifier)) { break; } } if (sock) { - strcpy(sock->name, iosock->name); + strcpy(sock->name, interface_socket->name); const int mask = SOCK_HIDE_VALUE; - sock->flag = (sock->flag & ~mask) | (iosock->flag & mask); + sock->flag = (sock->flag & ~mask) | (interface_socket->flag & mask); /* Update socket type if necessary */ - if (sock->typeinfo != iosock->typeinfo) { - nodeModifySocketType(ntree, gnode, sock, iosock->idname); + if (sock->typeinfo != interface_socket->typeinfo) { + nodeModifySocketType(ntree, gnode, sock, interface_socket->idname); /* Flag the tree to make sure link validity is updated after type changes. */ ntree->update |= NTREE_UPDATE_LINKS; } - if (iosock->typeinfo->interface_verify_socket) { - iosock->typeinfo->interface_verify_socket(ntree, iosock, gnode, sock, "interface"); + if (interface_socket->typeinfo->interface_verify_socket) { + interface_socket->typeinfo->interface_verify_socket( + ntree, interface_socket, gnode, sock, "interface"); } } else { - sock = nodeAddSocket(ntree, gnode, in_out, iosock->idname, iosock->identifier, iosock->name); - - if (iosock->typeinfo->interface_init_socket) { - iosock->typeinfo->interface_init_socket(ntree, iosock, gnode, sock, "interface"); + sock = nodeAddSocket(ntree, + gnode, + in_out, + interface_socket->idname, + interface_socket->identifier, + interface_socket->name); + + if (interface_socket->typeinfo->interface_init_socket) { + interface_socket->typeinfo->interface_init_socket( + ntree, interface_socket, gnode, sock, "interface"); } } |