From d1ef6ac79b9bc6f17e61802bea3c3c2fbfcfcfd0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 23 Sep 2011 11:15:47 +0000 Subject: [PATCH] Cycles: fix node name sometimes missing in node link menu text. --- source/blender/editors/interface/interface_node.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/interface/interface_node.c b/source/blender/editors/interface/interface_node.c index 354423a4db3..896924a10b5 100644 --- a/source/blender/editors/interface/interface_node.c +++ b/source/blender/editors/interface/interface_node.c @@ -138,16 +138,19 @@ static void ui_node_sock_name(bNodeSocket *sock, char name[UI_MAX_NAME_STR]) { 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);