[Bf-blender-cvs] [10b5ad5] master: 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.

[Lukas Tönne]

Commit: 10b5ad5bae9e6cbd5a3b37a9cb492cf9e2558a48
Author: Lukas Tönne
Date:   Fri Jan 10 16:51:45 2014 +0100
https://developer.blender.org/rB10b5ad5bae9e6cbd5a3b37a9cb492cf9e2558a48

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.

===================================================================

M       source/blender/nodes/intern/node_socket.c

===================================================================

diff --git a/source/blender/nodes/intern/node_socket.c 
b/source/blender/nodes/intern/node_socket.c
index a37042c..fddcc24 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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs