[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48774] trunk/blender/source/blender/ blenkernel/intern/node.c: fix for blender naming all new node groups " Missing Datablock"

[Campbell Barton]

Revision: 48774
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48774
Author:   campbellbarton
Date:     2012-07-09 22:39:35 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
fix for blender naming all new node groups "Missing Datablock"

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2012-07-09 22:32:00 UTC (rev 48773)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2012-07-09 22:39:35 UTC (rev 48774)
@@ -321,15 +321,18 @@
 	node->color[0] = node->color[1] = node->color[2] = 0.608;	/* default theme color */
 	
 	node_add_sockets_from_type(ntree, node, ntype);
-	
-	/* initialize the node name with the node label */
-	BLI_strncpy(node->name, nodeLabel(node), NODE_MAXSTR);
-	nodeUniqueName(ntree, node);
-	
+
 	BLI_addtail(&ntree->nodes, node);
 	
 	if (ntype->initfunc!=NULL)
 		ntype->initfunc(ntree, node, ntemp);
+
+	/* initialize the node name with the node label.
+	 * note: do this after the initfunc so nodes get
+	 * their data set which may be used in naming
+	 * (node groups for example) */
+	BLI_strncpy(node->name, nodeLabel(node), NODE_MAXSTR);
+	nodeUniqueName(ntree, node);
 	
 	ntree->update |= NTREE_UPDATE_NODES;