Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-14 09:44:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-14 09:44:47 +0400
commitf6c7a69565153f65e49a0f6421ad04d23cdd946a (patch)
tree0fcc6ce4607949dd0f667111a247516ec3e2228d /source/blender/editors/space_node/drawnode.c
parentb31a88ccf0e06ac9f7efb43e18c2a7b0fcf40ac4 (diff)
code cleanup: correct misleading use of LABEL button type.
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
-rw-r--r--source/blender/editors/space_node/drawnode.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index bdd1bcc7253..5ebcef1d9a7 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -647,23 +647,22 @@ static void update_group_output_cb(bContext *UNUSED(C), void *UNUSED(snode_v), v
static void draw_group_socket_name(SpaceNode *snode, bNode *gnode, bNodeSocket *sock,
int in_out, float xoffset, float yoffset)
{
- bNodeTree *ngroup = (bNodeTree *)gnode->id;
- uiBut *bt;
- const char *ui_name = IFACE_(sock->name);
-
if (sock->flag & SOCK_DYNAMIC) {
- bt = uiDefBut(gnode->block, TEX, 0, "",
- sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
- sock->name, 0, sizeof(sock->name), 0, 0, "");
+ bNodeTree *ngroup = (bNodeTree *)gnode->id;
+ uiBut *but;
+ but = uiDefBut(gnode->block, TEX, 0, "",
+ sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
+ sock->name, 0, sizeof(sock->name), 0, 0, "");
if (in_out == SOCK_IN)
- uiButSetFunc(bt, update_group_input_cb, snode, ngroup);
+ uiButSetFunc(but, update_group_input_cb, snode, ngroup);
else
- uiButSetFunc(bt, update_group_output_cb, snode, ngroup);
+ uiButSetFunc(but, update_group_output_cb, snode, ngroup);
}
else {
+ const char *ui_name = IFACE_(sock->name);
uiDefBut(gnode->block, LABEL, 0, ui_name,
sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
- NULL, 0, sizeof(ui_name), 0, 0, "");
+ NULL, 0, 0, 0, 0, "");
}
}