[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40489] branches/cycles/source/blender/ editors/interface/interface_node.c: Cycles: fix node name sometimes missing in node link menu text.

[Brecht Van Lommel]

Revision: 40489
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40489
Author:   blendix
Date:     2011-09-23 11:15:47 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Cycles: fix node name sometimes missing in node link menu text.

Modified Paths:
--------------
    branches/cycles/source/blender/editors/interface/interface_node.c

Modified: branches/cycles/source/blender/editors/interface/interface_node.c
===================================================================
--- branches/cycles/source/blender/editors/interface/interface_node.c	2011-09-23 10:58:20 UTC (rev 40488)
+++ branches/cycles/source/blender/editors/interface/interface_node.c	2011-09-23 11:15:47 UTC (rev 40489)
@@ -138,16 +138,19 @@
 {
 	if(sock->link && sock->link->fromnode) {
 		bNode *node = sock->link->fromnode;
+		char node_name[UI_MAX_NAME_STR];
 
 		if(node->type == NODE_GROUP)
-			BLI_strncpy(name, node->id->name+2, UI_MAX_NAME_STR);
+			BLI_strncpy(node_name, node->id->name+2, UI_MAX_NAME_STR);
 		else
-			BLI_strncpy(name, node->typeinfo->name, UI_MAX_NAME_STR);
+			BLI_strncpy(node_name, node->typeinfo->name, UI_MAX_NAME_STR);
 
 		if(node->inputs.first == NULL &&
 		   node->outputs.first != node->outputs.last &&
 		   !(node->typeinfo->flag & NODE_OPTIONS))
-			BLI_snprintf(name, UI_MAX_NAME_STR, "%s | %s", name, sock->link->fromsock->name);
+			BLI_snprintf(name, UI_MAX_NAME_STR, "%s | %s", node_name, sock->link->fromsock->name);
+		else
+			BLI_strncpy(name, node_name, UI_MAX_NAME_STR);
 	}
 	else if(sock->type == SOCK_SHADER)
 		BLI_strncpy(name, "None", UI_MAX_NAME_STR);