From ccfc8214126201bb6862804f8e3d8b89b67f63d5 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 26 Oct 2005 19:34:32 +0000 Subject: 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 --- source/blender/src/drawnla.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/src/drawnla.c') 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; -- cgit v1.2.3