sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

New icons for the sticky / face select state in the UV editor / Image Window.

Browse Source 
The png file containing the icons, 'blenderbuttons', was updated to contain
these new icons. It now also contains the icons from the 2.30 ui makeover.
The file had not been updated since then.
This commit is contained in:
Brecht Van Lommel 2004-04-05 12:42:23 +00:00
parent bcb7e33813
commit bce1190874
4 changed files with 1339 additions and 1334 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: 85 KiB

After

Width:  |  Height:  |  Size: 41 KiB

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

@ -107,9 +107,9 @@ typedef enum {
ICON_AXIS_SIDE, ICON_AXIS_SIDE,
ICON_AXIS_FRONT, ICON_AXIS_FRONT,
ICON_AXIS_TOP, ICON_AXIS_TOP,
ICON_BLANK14, ICON_DRAW_UVFACES,
ICON_BLANK15, ICON_STICKY_UVS,
ICON_BLANK16, ICON_STICKY2_UVS,
ICON_BLANK17, ICON_BLANK17,
ICON_BLANK18, ICON_BLANK18,
ICON_ENVMAP, ICON_ENVMAP,

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

File diff suppressed because it is too large Load Diff

20
source/blender/src/drawimage.c
View File

@ -543,16 +543,18 @@ static void draw_image_view_icon(void)
glRasterPos2f(5.0, 5.0); glRasterPos2f(5.0, 5.0);
if(G.sima->flag & SI_STICKYUVS || G.sima->flag & SI_LOCALSTICKY) if(G.sima->flag & SI_STICKYUVS) {
BIF_draw_icon(ICON_A_WACKY_VERT_AND_SOME_LINES); BIF_draw_icon(ICON_STICKY2_UVS);
else glRasterPos2f(25.0, 5.0);
BIF_draw_icon(ICON_SOME_WACKY_VERTS_AND_LINES); }
else if(G.sima->flag & SI_LOCALSTICKY) {
BIF_draw_icon(ICON_STICKY_UVS);
glRasterPos2f(25.0, 5.0);
}
glRasterPos2f(25.0, 5.0); if(G.sima->flag & SI_SELACTFACE) {
if(G.sima->flag & SI_SELACTFACE) BIF_draw_icon(ICON_DRAW_UVFACES);
BIF_draw_icon(ICON_CLIPUV_HLT); }
else
BIF_draw_icon(ICON_CLIPUV_DEHLT);
glBlendFunc(GL_ONE, GL_ZERO); glBlendFunc(GL_ONE, GL_ZERO);
glDisable(GL_BLEND); glDisable(GL_BLEND);