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

== Action/IPO Mute Icons ==

Browse Source 
Added new defines for the icons used to show this, on the request of Matt Ebb. For now, the eye icons have simply been duplicated to the new spaces, but 'more descriptive' icons should be made.
This commit is contained in:
Joshua Leung 2007-07-03 01:23:30 +00:00
parent 2929e8f65a
commit b6ccafc501
6 changed files with 2073 additions and 2123 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: 66 KiB

After

Width:  |  Height:  |  Size: 64 KiB

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

@ -322,8 +322,8 @@ typedef enum {
ICON_VPAINT_COL,
ICON_RESTRICT_SELECT_OFF,
ICON_RESTRICT_SELECT_ON,
ICON_BLANK45,
ICON_BLANK46,
ICON_MUTE_IPO_OFF,
ICON_MUTE_IPO_ON,
ICON_MAN_TRANS,
ICON_MAN_ROT,

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

File diff suppressed because it is too large Load Diff

12
source/blender/src/drawaction.c
View File

@ -446,9 +446,9 @@ static void draw_channel_names(void)
if (achan->ipo) {
if (achan->ipo->muteipo)
mute = ICON_RESTRICT_VIEW_ON;
mute = ICON_MUTE_IPO_ON;
else
mute = ICON_RESTRICT_VIEW_OFF;
mute = ICON_MUTE_IPO_OFF;
}
sel = SEL_ACHAN(achan);
@ -468,9 +468,9 @@ static void draw_channel_names(void)
if (conchan->ipo) {
if (conchan->ipo->muteipo)
mute = ICON_RESTRICT_VIEW_ON;
mute = ICON_MUTE_IPO_ON;
else
mute = ICON_RESTRICT_VIEW_OFF;
mute = ICON_MUTE_IPO_OFF;
}
sel = SEL_CONCHAN(conchan);
@ -485,9 +485,9 @@ static void draw_channel_names(void)
protect = -1; // for now, until this can be supported by others
if (icu->flag & IPO_MUTE)
mute = ICON_RESTRICT_VIEW_ON;
mute = ICON_MUTE_IPO_ON;
else
mute = ICON_RESTRICT_VIEW_OFF;
mute = ICON_MUTE_IPO_OFF;
sel = SEL_ICU(icu);
sprintf(name, getname_ipocurve(icu));

8
source/blender/src/drawnla.c
View File

@ -152,9 +152,9 @@ static void draw_nla_channels(void)
/* icon to indicate if ipo-channel muted */
if (ob->ipo) {
if (ob->ipo->muteipo)
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_RESTRICT_VIEW_ON);
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_MUTE_IPO_ON);
else
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_RESTRICT_VIEW_OFF);
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_MUTE_IPO_OFF);
}
glDisable(GL_BLEND);
@ -210,9 +210,9 @@ static void draw_nla_channels(void)
BIF_icon_draw(x+34, y-8, ICON_MODIFIER);
if(strip->flag & ACTSTRIP_MUTE)
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_RESTRICT_VIEW_ON);
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_MUTE_IPO_ON);
else
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_RESTRICT_VIEW_OFF);
BIF_icon_draw(NLAWIDTH-16, y-NLACHANNELHEIGHT/2, ICON_MUTE_IPO_OFF);
glDisable(GL_BLEND);
}

2
source/blender/src/header_ipo.c
View File

@ -1261,7 +1261,7 @@ void ipo_buttons(void)
/* ipo muting */
if (G.sipo->ipo) {
uiDefIconButS(block, ICONTOG, 1, ICON_RESTRICT_VIEW_OFF, xco,0,XIC,YIC, &(G.sipo->ipo->muteipo), 0, 0, 0, 0, "Mute IPO-block");
uiDefIconButS(block, ICONTOG, 1, ICON_MUTE_IPO_OFF, xco,0,XIC,YIC, &(G.sipo->ipo->muteipo), 0, 0, 0, 0, "Mute IPO-block");
xco += XIC;
}