[Bf-blender-cvs] [ebf23b5] master: Fix T38075, crash from shader node add/replace tree view template.

[Lukas Tönne]

Commit: ebf23b51448e4bc9c67d656093ecc01be882c9d3
Author: Lukas Tönne
Date:   Tue Jan 7 10:54:31 2014 +0100
https://developer.blender.org/rBebf23b51448e4bc9c67d656093ecc01be882c9d3

Fix T38075, crash from shader node add/replace tree view template.

The sanity check for copying socket default value was using the socket
idname for type compatibility checks, which is too strict. Subtypes
would not be recognized as copyable, but since only the plain data type
is needed below this is all that needs to be checked.

That alone would not cause crash (just missing default value copy),
but the tree view template was messing with the default_value DNA
directly by freeing it in advance, which is not necessary and should
be left to blenkernel when freeing the node. Otherwise this would
leave the node invalid without a default_value if the copy function
bails out.

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

M	source/blender/editors/space_node/node_templates.c
M	source/blender/nodes/intern/node_socket.c

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

diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index b544e75..ac0010b 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -246,10 +246,6 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
 						nodeRemLink(ntree, link);
 					}
 
-					if (sock_from->default_value) {
-						MEM_freeN(sock_from->default_value);
-						sock_from->default_value = NULL;
-					}
 					node_socket_copy_default_value(sock_from, sock_prev);
 				}
 			}
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 92d4036..a37042c 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -273,7 +273,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
 void node_socket_copy_default_value(bNodeSocket *to, bNodeSocket *from)
 {
 	/* sanity check */
-	if (!STREQ(to->idname, from->idname))
+	if (to->type != from->type)
 		return;
 	
 	/* make sure both exist */