diff options
Diffstat (limited to 'source/blender/editors/space_node/node_templates.c')
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 049886b1d66..13e85c7f74d 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -220,8 +220,10 @@ static void node_socket_add_replace(Main *bmain, bNodeTree *ntree, bNode *node_t /* also preserve mapping for texture nodes */ if (node_from->typeinfo->nclass == NODE_CLASS_TEXTURE && - node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE) + node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE) + { memcpy(node_from->storage, node_prev->storage, sizeof(NodeTexBase)); + } /* remove node */ node_remove_linked(ntree, node_prev); @@ -295,11 +297,14 @@ static void ui_node_sock_name(bNodeSocket *sock, char 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)) + node->outputs.first != node->outputs.last && + !(node->typeinfo->flag & NODE_OPTIONS)) + { BLI_snprintf(name, UI_MAX_NAME_STR, "%s | %s", node_name, sock->link->fromsock->name); - else + } + else { BLI_strncpy(name, node_name, UI_MAX_NAME_STR); + } } else if (sock->type == SOCK_SHADER) BLI_strncpy(name, "None", UI_MAX_NAME_STR); |