diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-10-26 23:34:32 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-10-26 23:34:32 +0400 |
| commit | ccfc8214126201bb6862804f8e3d8b89b67f63d5 (patch) | |
| tree | 73825d6a44875a07e05021452b7d606695fd804b /source/blender/src/drawnla.c | |
| parent | d5617f7f596b44994a2be381a8cde585eee25208 (diff) | |
Orange bugfixes in NLA editor;
- ALT+C "convert action into strip" didn't calculate the mouse position
correct. Also changed menu a bit to tell which action it makes a strip
- Select action strips now activates Object too
- Icons in Object 'row' (denoting NLA override or not) now draw blended
Diffstat (limited to 'source/blender/src/drawnla.c')
| -rw-r--r-- | source/blender/src/drawnla.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 5c8a9ade3d9..ed85e497dc2 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -126,10 +126,12 @@ static void draw_nla_channels(void) /* icon to indicate nla or action */ if(ob->nlastrips.first && ob->action) { + glEnable(GL_BLEND); if(ob->nlaflag & OB_NLA_OVERRIDE) - BIF_draw_icon(x+5, y-8, ICON_NLA); + BIF_draw_icon_blended(x+5, y-8, ICON_NLA, TH_HEADER, 0); else - BIF_draw_icon(x+5, y-8, ICON_ACTION); + BIF_draw_icon_blended(x+5, y-8, ICON_ACTION, TH_HEADER, 0); + glDisable(GL_BLEND); } y-=NLACHANNELHEIGHT+NLACHANNELSKIP; |