diff options
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_templates.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index eae8bd05a93..206167869ed 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -556,35 +556,35 @@ void ED_node_composit_default(const bContext *C, struct Scene *sce) /* assumes nothing being done in ntree yet, sets the default in/out node */ /* called from shading buttons or header */ -void ED_node_texture_default(const bContext *C, Tex *tx) +void ED_node_texture_default(const bContext *C, Tex *tex) { bNode *in, *out; bNodeSocket *fromsock, *tosock; /* but lets check it anyway */ - if (tx->nodetree) { + if (tex->nodetree) { if (G.debug & G_DEBUG) { printf("error in texture initialize\n"); } return; } - tx->nodetree = ntreeAddTree(NULL, "Texture Nodetree", ntreeType_Texture->idname); + tex->nodetree = ntreeAddTree(NULL, "Texture Nodetree", ntreeType_Texture->idname); - out = nodeAddStaticNode(C, tx->nodetree, TEX_NODE_OUTPUT); + out = nodeAddStaticNode(C, tex->nodetree, TEX_NODE_OUTPUT); out->locx = 300.0f; out->locy = 300.0f; - in = nodeAddStaticNode(C, tx->nodetree, TEX_NODE_CHECKER); + in = nodeAddStaticNode(C, tex->nodetree, TEX_NODE_CHECKER); in->locx = 10.0f; in->locy = 300.0f; - nodeSetActive(tx->nodetree, in); + nodeSetActive(tex->nodetree, in); fromsock = in->outputs.first; tosock = out->inputs.first; - nodeAddLink(tx->nodetree, in, fromsock, out, tosock); + nodeAddLink(tex->nodetree, in, fromsock, out, tosock); - ntreeUpdateTree(CTX_data_main(C), tx->nodetree); + ntreeUpdateTree(CTX_data_main(C), tex->nodetree); } /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */ diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 654bb94cc78..c5be96470ec 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -664,7 +664,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_ } void uiTemplateNodeLink( - uiLayout *layout, bContext *C, bNodeTree *ntree, bNode *node, bNodeSocket *sock) + uiLayout *layout, bContext *C, bNodeTree *ntree, bNode *node, bNodeSocket *input) { uiBlock *block = uiLayoutGetBlock(layout); NodeLinkArg *arg; @@ -674,17 +674,17 @@ void uiTemplateNodeLink( arg = MEM_callocN(sizeof(NodeLinkArg), "NodeLinkArg"); arg->ntree = ntree; arg->node = node; - arg->sock = sock; + arg->sock = input; PointerRNA node_ptr; RNA_pointer_create((ID *)ntree, &RNA_Node, node, &node_ptr); - node_socket_color_get(C, ntree, &node_ptr, sock, socket_col); + node_socket_color_get(C, ntree, &node_ptr, input, socket_col); UI_block_layout_set_current(block, layout); - if (sock->link || sock->type == SOCK_SHADER || (sock->flag & SOCK_HIDE_VALUE)) { + if (input->link || input->type == SOCK_SHADER || (input->flag & SOCK_HIDE_VALUE)) { char name[UI_MAX_NAME_STR]; - ui_node_sock_name(ntree, sock, name); + ui_node_sock_name(ntree, input, name); but = uiDefMenuBut( block, ui_template_node_link_menu, NULL, name, 0, 0, UI_UNIT_X * 4, UI_UNIT_Y, ""); } @@ -694,14 +694,14 @@ void uiTemplateNodeLink( } UI_but_type_set_menu_from_pulldown(but); - UI_but_node_link_set(but, sock, socket_col); + UI_but_node_link_set(but, input, socket_col); UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT); but->poin = (char *)but; but->func_argN = arg; - if (sock->link && sock->link->fromnode) { - if (sock->link->fromnode->flag & NODE_ACTIVE_TEXTURE) { + if (input->link && input->link->fromnode) { + if (input->link->fromnode->flag & NODE_ACTIVE_TEXTURE) { but->flag |= UI_BUT_NODE_ACTIVE; } } |