diff options
author | Juho Vepsalainen <bebraw@gmail.com> | 2008-01-08 22:06:46 +0300 |
---|---|---|
committer | Juho Vepsalainen <bebraw@gmail.com> | 2008-01-08 22:06:46 +0300 |
commit | 2630c2c9f3ff191587c5ff380ead82e63fdc843e (patch) | |
tree | 256822e79c27e3802e725f1f6183b53dfc5d2f9e /source/blender/src/drawnode.c | |
parent | 5b6f97797053bda88fd5ff5f33200e0130d11003 (diff) |
Minor changes to node rename tool
Rename was changed to work on the last selected node. Also size of a couple of
character arrays was changed to avoid buffer overflows.
Custom name shows up now just fine in group header in case it is being edited
as it did not before.
Diffstat (limited to 'source/blender/src/drawnode.c')
-rw-r--r-- | source/blender/src/drawnode.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c index 633d4ab5c1b..961cad5f840 100644 --- a/source/blender/src/drawnode.c +++ b/source/blender/src/drawnode.c @@ -2525,7 +2525,7 @@ static void node_draw_basis(ScrArea *sa, SpaceNode *snode, bNode *node) rctf *rct= &node->totr; float slen, iconofs; int ofs, color_id= node_get_colorid(node); - char showname[64]; + char showname[128]; uiSetRoundBox(15-4); ui_dropshadow(rct, BASIS_RAD, snode->aspect, node->flag & SELECT); @@ -2737,7 +2737,7 @@ static void node_draw_hidden(SpaceNode *snode, bNode *node) float dx, centy= 0.5f*(rct->ymax+rct->ymin); float hiddenrad= 0.5f*(rct->ymax-rct->ymin); int color_id= node_get_colorid(node); - char showname[64]; + char showname[128]; /* shadow */ uiSetRoundBox(15); @@ -2983,6 +2983,7 @@ static void node_draw_group(ScrArea *sa, SpaceNode *snode, bNode *gnode) bNodeTree *ngroup= (bNodeTree *)gnode->id; bNodeSocket *sock; rctf rect= gnode->totr; + char showname[128]; /* backdrop header */ glEnable(GL_BLEND); @@ -3006,7 +3007,17 @@ static void node_draw_group(ScrArea *sa, SpaceNode *snode, bNode *gnode) /* backdrop title */ BIF_ThemeColor(TH_TEXT_HI); ui_rasterpos_safe(rect.xmin+8.0f, rect.ymax+5.0f, snode->aspect); - BIF_DrawString(snode->curfont, ngroup->id.name+2, 0); + + if(gnode->username[0]) { + strcpy(showname,"("); + strcat(showname, gnode->username); + strcat(showname,") "); + strcat(showname, ngroup->id.name+2); + } + else + strcpy(showname, ngroup->id.name+2); + + BIF_DrawString(snode->curfont, showname, 0); /* links from groupsockets to the internal nodes */ node_draw_group_links(snode, gnode); |