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:
authorTon Roosendaal <ton@blender.org>2005-12-18 16:27:11 +0300
committerTon Roosendaal <ton@blender.org>2005-12-18 16:27:11 +0300
commite3df5fbdc15519e25e3ecd3981e5b183e09c0ebc (patch)
treea7945e9e14a3271a3bfda340bd22ccf432e908b1 /source/blender/src/interface.c
parent97a4119be0ef89d2f4670f99903262b794e9e129 (diff)
Added Verse and Node-editor icons in blenderbuttons.c
(Both needed for later) Found bug in interface.c for translation of Panel header, using && instead of a logical &.
Diffstat (limited to 'source/blender/src/interface.c')
-rw-r--r--source/blender/src/interface.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index dfa919cc562..d75fcda001c 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -5649,12 +5649,12 @@ short pupmenu(char *instr)
md= decompose_menu_string(instr);
/* size and location, title slightly bigger for bold */
- if(md->title) width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts && USER_TR_BUTTONS));
+ if(md->title) width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts & USER_TR_BUTTONS));
else width= 0;
for(a=0; a<md->nitems; a++) {
char *name= md->items[a].str;
- xmax= BIF_GetStringWidth(uiBlockGetCurFont(block), md->items[a].str, (U.transopts && USER_TR_BUTTONS));
+ xmax= BIF_GetStringWidth(uiBlockGetCurFont(block), md->items[a].str, (U.transopts & USER_TR_BUTTONS));
if(xmax>width) width= xmax;
if( strcmp(name, "%l")==0) height+= PUP_LABELH;