diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-01-10 19:51:45 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-01-10 19:53:20 +0400 |
| commit | 10b5ad5bae9e6cbd5a3b37a9cb492cf9e2558a48 (patch) | |
| tree | 16ae70fb52aa32b9afe59b9e533a4fa3193d96de /source/blender/nodes/intern/node_socket.c | |
| parent | ee15db9db595ca47412664e3cb291dc23b73b0a4 (diff) | |
Fix T38142: socket interface 'type' enums are not initialized. These are
not really needed anyway, but need to be adjusted to make use of the
socket value copy methods.
Diffstat (limited to 'source/blender/nodes/intern/node_socket.c')
| -rw-r--r-- | source/blender/nodes/intern/node_socket.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index a37042c9d70..fddcc249f99 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -334,6 +334,10 @@ static void standard_node_socket_interface_init_socket(bNodeTree *UNUSED(ntree), /* initialize the type value */ sock->type = sock->typeinfo->type; + /* XXX socket interface 'type' value is not used really, + * but has to match or the copy function will bail out + */ + stemp->type = stemp->typeinfo->type; /* copy default_value settings */ node_socket_copy_default_value(sock, stemp); } @@ -342,7 +346,7 @@ static void standard_node_socket_interface_init_socket(bNodeTree *UNUSED(ntree), static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree), bNodeSocket *stemp, bNode *UNUSED(node), bNodeSocket *sock, const char *UNUSED(data_path)) { /* sanity check */ - if (!STREQ(sock->idname, stemp->idname)) + if (sock->type != stemp->typeinfo->type) return; /* make sure both exist */ @@ -381,6 +385,7 @@ static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree static void standard_node_socket_interface_from_socket(bNodeTree *UNUSED(ntree), bNodeSocket *stemp, bNode *UNUSED(node), bNodeSocket *sock) { /* initialize settings */ + stemp->type = stemp->typeinfo->type; node_socket_copy_default_value(stemp, sock); } |