bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

* More icon updates, thanks to Jendryzch. That's all the modifiers now, I think!

Browse Source
This commit is contained in:
Matt Ebb 2009-05-05 02:24:58 +00:00
parent b753d6fd2d
commit 08df158672
6 changed files with 4588 additions and 4495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blenderbuttons
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 143 KiB

9056
source/blender/editors/datafiles/blenderbuttons.c
View File

File diff suppressed because it is too large Load Diff

6
source/blender/editors/include/UI_resources.h
View File

@ -377,8 +377,8 @@ typedef enum {
/* MODIFIERS */
ICON_MOD_CLOTH,
ICON_MOD_EXPLODE,
ICON_BLANK155,
ICON_BLANK156,
ICON_MOD_FLUIDSIM,
ICON_MOD_MULTIRES,
ICON_BLANK157,
ICON_BLANK158,
ICON_BLANK159,
@ -652,7 +652,7 @@ typedef enum {
ICON_BLANK314,
ICON_BLANK315,
ICON_BLANK316,
ICON_BLANK316b,
ICON_DISK_DRIVE,
/* SHADING / TEXT */
ICON_MATPLANE,

4
source/blender/editors/interface/interface_utils.c
View File

@ -235,6 +235,10 @@ int UI_GetIconRNA(PointerRNA *ptr)
return ICON_MOD_EXPLODE;
else if(rnatype == &RNA_CollisionModifier)
return ICON_MOD_PHYSICS;
else if(rnatype == &RNA_FluidSimulationModifier)
return ICON_MOD_FLUIDSIM;
else if(rnatype == &RNA_MultiresModifier)
return ICON_MOD_MULTIRES;
else
return ICON_DOT;
}

13
source/blender/editors/space_file/file_draw.c
View File

@ -551,9 +551,9 @@ static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCate
short sx, sy, xpos, ypos;
int bmwidth = ar->v2d.cur.xmax - ar->v2d.cur.xmin - 2*TILE_BORDER_X - ICON_DEFAULT_WIDTH - 4;
int fontsize = gFontsize;
int cat_icon;
int i;
sx = ar->v2d.cur.xmin + TILE_BORDER_X;
sy = *starty;
@ -562,6 +562,15 @@ static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCate
sy -= linestep;
switch(category) {
case FS_CATEGORY_SYSTEM:
cat_icon = ICON_DISK_DRIVE; break;
case FS_CATEGORY_BOOKMARKS:
cat_icon = ICON_BOOKMARKS; break;
case FS_CATEGORY_RECENT:
cat_icon = ICON_FILE_FOLDER; break;
}
for (i=0; i< nentries && (sy > ar->v2d.cur.ymin) ;++i) {
char *fname = fsmenu_get_entry(fsmenu, category, i);
@ -590,7 +599,7 @@ static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCate
xpos = sx;
ypos = sy - (TILE_BORDER_Y * 0.5);
file_draw_icon(xpos, ypos, ICON_FILE_FOLDER, ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH);
file_draw_icon(xpos, ypos, cat_icon, ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH);
xpos += ICON_DEFAULT_WIDTH + 4;
file_draw_string(xpos, ypos, bookmark, bmwidth, fontsize, FILE_SHORTEN_FRONT);
sy -= linestep;

4
source/blender/editors/space_outliner/outliner.c
View File

@ -3595,6 +3595,10 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
UI_icon_draw(x, y, ICON_MOD_EXPLODE); break;
case eModifierType_Collision:
UI_icon_draw(x, y, ICON_MOD_PHYSICS); break;
case eModifierType_Fluidsim:
UI_icon_draw(x, y, ICON_MOD_FLUIDSIM); break;
case eModifierType_Multires:
UI_icon_draw(x, y, ICON_MOD_MULTIRES); break;
default:
UI_icon_draw(x, y, ICON_DOT); break;
}