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

* More icon updates

Browse Source
This commit is contained in:
Matt Ebb 2009-02-18 04:36:07 +00:00
parent d00b18c718
commit ba59754a1d
7 changed files with 3897 additions and 3897 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: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB

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

File diff suppressed because it is too large Load Diff

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

@ -51,8 +51,8 @@ typedef enum {
ICON_PLUS,
ICON_DISCLOSURE_TRI_DOWN,
ICON_DISCLOSURE_TRI_RIGHT,
ICON_CHECKBOX_DEHLT,
ICON_CHECKBOX_HLT,
ICON_RADIOBUT_OFF,
ICON_RADIOBUT_ON,
ICON_MENU_PANEL,
ICON_PYTHON,
ICON_BLANK003,
@ -79,8 +79,8 @@ typedef enum {
ICON_EYEDROPPER,
ICON_BLANK010,
ICON_AUTO,
ICON_BLANK011,
ICON_BLANK012,
ICON_CHECKBOX_DEHLT,
ICON_CHECKBOX_HLT,
ICON_UNLOCKED,
ICON_LOCKED,
ICON_BLANK013,
@ -240,13 +240,13 @@ typedef enum {
ICON_FILE,
ICON_FCURVE,
ICON_FONT,
ICON_CURVE_HLT,
ICON_MBALL_HLT,
ICON_LATTICE_HLT,
ICON_LAMP_HLT,
ICON_MATERIAL_HLT,
ICON_TEXTURE_HLT,
ICON_IPO_HLT,
ICON_RENDER_RESULT,
ICON_BLANK080A,
ICON_BLANK080B,
ICON_BLANK080C,
ICON_BLANK080D,
ICON_BLANK080E,
ICON_BLANK080F,
ICON_BLANK080,
ICON_BLANK081,
ICON_LIBRARY_HLT,
@ -687,15 +687,15 @@ typedef enum {
ICON_SEQ_PREVIEW,
ICON_SEQ_LUMA_WAVEFORM,
ICON_SEQ_CHROMA_SCOPE,
ICON_BLANK329,
ICON_SEQ_HISTOGRAM,
ICON_BLANK330,
ICON_BLANK331,
ICON_BLANK332,
ICON_BLANK333,
ICON_TRANSP_HLT, // XXX CHANGE TO STRAIGHT ALPHA, Z ETC
ICON_TRANSP_DEHLT,
ICON_BLANK334,
ICON_BLANK335,
ICON_IMAGE_RGB, // XXX CHANGE TO STRAIGHT ALPHA, Z ETC
ICON_IMAGE_RGB_ALPHA,
ICON_IMAGE_ALPHA,
ICON_IMAGE_ZDEPTH,
ICON_IMAGEFILE,
ICON_BLANK336,
ICON_BLANK337,

5
source/blender/editors/space_graph/graph_draw.c
View File

@ -1053,11 +1053,10 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
}
/* for now, 'special' (i.e. in front of name) is used to show visibility status */
// XXX these 'blank' icons are currently checkboxes
if (fcu->flag & FCURVE_VISIBLE)
special= ICON_BLANK012;
special= ICON_CHECKBOX_HLT;
else
special= ICON_BLANK011;
special= ICON_CHECKBOX_DEHLT;
if (fcu->flag & FCURVE_MUTED)
mute = ICON_MUTE_IPO_ON;

8
source/blender/editors/space_image/image_header.c
View File

@ -892,17 +892,17 @@ void image_header_buttons(const bContext *C, ARegion *ar)
/* image draw options */
uiBlockBeginAlign(block);
uiDefIconButR(block, ROW, B_REDR, ICON_TEXTURE, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, 0, 0, 0, NULL);
uiDefIconButR(block, ROW, B_REDR, ICON_IMAGE_RGB, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, 0, 0, 0, NULL);
xco+= XIC;
if(ibuf==NULL || ibuf->channels==4) {
uiDefIconButR(block, ROW, B_REDR, ICON_TRANSP_HLT, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_USE_ALPHA, 0, 0, NULL);
uiDefIconButR(block, ROW, B_REDR, ICON_IMAGE_RGB_ALPHA, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_USE_ALPHA, 0, 0, NULL);
xco+= XIC;
uiDefIconButR(block, ROW, B_REDR, ICON_DOT, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_SHOW_ALPHA, 0, 0, NULL);
uiDefIconButR(block, ROW, B_REDR, ICON_IMAGE_ALPHA, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_SHOW_ALPHA, 0, 0, NULL);
xco+= XIC;
}
if(ibuf) {
if(ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels==1)) {
uiDefIconButR(block, ROW, B_REDR, ICON_SOLID, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_SHOW_ZBUF, 0, 0, NULL);
uiDefIconButR(block, ROW, B_REDR, ICON_IMAGE_ZDEPTH, xco,yco,XIC,YIC, &spaceptr, "draw_channels", 0, 0, SI_SHOW_ZBUF, 0, 0, NULL);
xco+= XIC;
}
}

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

@ -3449,7 +3449,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
case TSE_R_LAYER_BASE:
UI_icon_draw(x, y, ICON_RENDERLAYERS); break;
case TSE_R_LAYER:
UI_icon_draw(x, y, ICON_IMAGE_DEHLT); break;
UI_icon_draw(x, y, ICON_RENDER_RESULT); break;
case TSE_LINKED_LAMP:
UI_icon_draw(x, y, ICON_LAMP_DEHLT); break;
case TSE_LINKED_MAT:

4
source/blender/editors/space_view3d/view3d_header.c
View File

@ -4853,7 +4853,7 @@ static char *view3d_modeselect_pup(Scene *scene)
}
if (ob->particlesystem.first) {
str += sprintf(str, formatstr, "Particle Mode", V3D_PARTICLEEDITMODE_SEL, ICON_PHYSICS);
str += sprintf(str, formatstr, "Particle Mode", V3D_PARTICLEEDITMODE_SEL, ICON_PARTICLEMODE);
}
return (string);
@ -5574,7 +5574,7 @@ void view3d_header_buttons(const bContext *C, ARegion *ar)
xco+= 20;
}
uiDefIconBut(block, BUT, B_VIEWRENDER, ICON_SCENE_DEHLT, xco,yco,XIC,YIC, NULL, 0, 1.0, 0, 0, "Render this window (Ctrl Click for anim)");
uiDefIconBut(block, BUT, B_VIEWRENDER, ICON_SCENE, xco,yco,XIC,YIC, NULL, 0, 1.0, 0, 0, "Render this window (Ctrl Click for anim)");
if (ob && (ob->flag & OB_POSEMODE)) {