griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: fix node name sometimes missing in node link menu text.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-09-23 11:15:47 +00:00
parent 508bfebf36
commit d1ef6ac79b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/interface_node.c
View File

@@ -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);