forked from bartvdbraak/blender
* More icon updates, thanks to Jendryzch. That's all the modifiers now, I think!
This commit is contained in:
parent
b753d6fd2d
commit
08df158672
Binary file not shown.
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 143 KiB |
File diff suppressed because it is too large
Load Diff
@ -377,8 +377,8 @@ typedef enum {
|
|||||||
/* MODIFIERS */
|
/* MODIFIERS */
|
||||||
ICON_MOD_CLOTH,
|
ICON_MOD_CLOTH,
|
||||||
ICON_MOD_EXPLODE,
|
ICON_MOD_EXPLODE,
|
||||||
ICON_BLANK155,
|
ICON_MOD_FLUIDSIM,
|
||||||
ICON_BLANK156,
|
ICON_MOD_MULTIRES,
|
||||||
ICON_BLANK157,
|
ICON_BLANK157,
|
||||||
ICON_BLANK158,
|
ICON_BLANK158,
|
||||||
ICON_BLANK159,
|
ICON_BLANK159,
|
||||||
@ -652,7 +652,7 @@ typedef enum {
|
|||||||
ICON_BLANK314,
|
ICON_BLANK314,
|
||||||
ICON_BLANK315,
|
ICON_BLANK315,
|
||||||
ICON_BLANK316,
|
ICON_BLANK316,
|
||||||
ICON_BLANK316b,
|
ICON_DISK_DRIVE,
|
||||||
|
|
||||||
/* SHADING / TEXT */
|
/* SHADING / TEXT */
|
||||||
ICON_MATPLANE,
|
ICON_MATPLANE,
|
||||||
|
@ -235,6 +235,10 @@ int UI_GetIconRNA(PointerRNA *ptr)
|
|||||||
return ICON_MOD_EXPLODE;
|
return ICON_MOD_EXPLODE;
|
||||||
else if(rnatype == &RNA_CollisionModifier)
|
else if(rnatype == &RNA_CollisionModifier)
|
||||||
return ICON_MOD_PHYSICS;
|
return ICON_MOD_PHYSICS;
|
||||||
|
else if(rnatype == &RNA_FluidSimulationModifier)
|
||||||
|
return ICON_MOD_FLUIDSIM;
|
||||||
|
else if(rnatype == &RNA_MultiresModifier)
|
||||||
|
return ICON_MOD_MULTIRES;
|
||||||
else
|
else
|
||||||
return ICON_DOT;
|
return ICON_DOT;
|
||||||
}
|
}
|
||||||
|
@ -551,9 +551,9 @@ static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCate
|
|||||||
short sx, sy, xpos, ypos;
|
short sx, sy, xpos, ypos;
|
||||||
int bmwidth = ar->v2d.cur.xmax - ar->v2d.cur.xmin - 2*TILE_BORDER_X - ICON_DEFAULT_WIDTH - 4;
|
int bmwidth = ar->v2d.cur.xmax - ar->v2d.cur.xmin - 2*TILE_BORDER_X - ICON_DEFAULT_WIDTH - 4;
|
||||||
int fontsize = gFontsize;
|
int fontsize = gFontsize;
|
||||||
|
int cat_icon;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
||||||
sx = ar->v2d.cur.xmin + TILE_BORDER_X;
|
sx = ar->v2d.cur.xmin + TILE_BORDER_X;
|
||||||
sy = *starty;
|
sy = *starty;
|
||||||
|
|
||||||
@ -562,6 +562,15 @@ static void file_draw_fsmenu_category(const bContext *C, ARegion *ar, FSMenuCate
|
|||||||
|
|
||||||
sy -= linestep;
|
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) {
|
for (i=0; i< nentries && (sy > ar->v2d.cur.ymin) ;++i) {
|
||||||
char *fname = fsmenu_get_entry(fsmenu, category, 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;
|
xpos = sx;
|
||||||
ypos = sy - (TILE_BORDER_Y * 0.5);
|
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;
|
xpos += ICON_DEFAULT_WIDTH + 4;
|
||||||
file_draw_string(xpos, ypos, bookmark, bmwidth, fontsize, FILE_SHORTEN_FRONT);
|
file_draw_string(xpos, ypos, bookmark, bmwidth, fontsize, FILE_SHORTEN_FRONT);
|
||||||
sy -= linestep;
|
sy -= linestep;
|
||||||
|
@ -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;
|
UI_icon_draw(x, y, ICON_MOD_EXPLODE); break;
|
||||||
case eModifierType_Collision:
|
case eModifierType_Collision:
|
||||||
UI_icon_draw(x, y, ICON_MOD_PHYSICS); break;
|
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:
|
default:
|
||||||
UI_icon_draw(x, y, ICON_DOT); break;
|
UI_icon_draw(x, y, ICON_DOT); break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user