archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added Verse and Node-editor icons in blenderbuttons.c

Browse Source 
(Both needed for later)

Found bug in interface.c for translation of Panel header, using && instead
of a logical &.
This commit is contained in:
Ton Roosendaal
2005-12-18 13:27:11 +00:00
parent 97a4119be0
commit e3df5fbdc1
3 changed files with 1491 additions and 1469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/include/BIF_resources.h
View File

@@ -50,7 +50,7 @@ typedef enum {
ICON_NLA, ICON_NLA,
ICON_SCRIPTWIN, ICON_SCRIPTWIN,
ICON_TIME, ICON_TIME,
ICON_SPACE1, ICON_NODE,
ICON_SPACE2, ICON_SPACE2,
ICON_SPACE3, ICON_SPACE3,
ICON_SPACE4, ICON_SPACE4,
@@ -91,7 +91,7 @@ typedef enum {
ICON_MAYBE_ITS_A_LASSO, ICON_MAYBE_ITS_A_LASSO,
ICON_BLANK1, /* ATTENTION, someone decided to use this throughout blender ICON_BLANK1, /* ATTENTION, someone decided to use this throughout blender
and didn't care to neither rename it nor update the PNG */ and didn't care to neither rename it nor update the PNG */
ICON_BLANK2, ICON_VERSE,
ICON_MOD_BOOLEAN, ICON_MOD_BOOLEAN,
ICON_ARMATURE, ICON_ARMATURE,
ICON_PAUSE, ICON_PAUSE,

2952
source/blender/src/blenderbuttons.c
View File

File diff suppressed because it is too large Load Diff

4
source/blender/src/interface.c
View File

@@ -5649,12 +5649,12 @@ short pupmenu(char *instr)
md= decompose_menu_string(instr); md= decompose_menu_string(instr);
/* size and location, title slightly bigger for bold */ /* 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; else width= 0;
for(a=0; a<md->nitems; a++) { for(a=0; a<md->nitems; a++) {
char *name= md->items[a].str; 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(xmax>width) width= xmax;
if( strcmp(name, "%l")==0) height+= PUP_LABELH; if( strcmp(name, "%l")==0) height+= PUP_LABELH;