From 2812e6a069f71676ac87fc9328b611aee9467c35 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 4 May 2014 19:19:39 +1200 Subject: NLA Editor: Added dedicated icons for "pushdown" operator and for indicating the "tweaking" state 1) The "pushdown" operation is the actual name for the functionality previously represented by the snowflake. That is, pushing the active action onto the NLA stack as a new strip. The icon that is introduced here is the icon I originally wanted to use here for this purpose (but couldn't at the time the NLA was coded as we didn't have the master SVG available yet). I'm making this change now to hopefully make the "animation-layers" intentions behind the NLA design a lot clearer than they have been so far. 2) Also added a dedicated icon for representing that the active action is in the "tweaking" state (i.e. we're editing a particular strip's action). Previously we were abusing an icon designed for an entirely different purpose, mainly since its identifier looked like it would work. --- source/blender/editors/space_nla/nla_draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_nla/nla_draw.c') diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 948e1a37e90..a76612b0e53 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -788,7 +788,7 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View offset += 0.8f * U.widget_unit; /* 'tweaking action' indicator - not a button */ - UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_EDIT); + UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_ACTION_TWEAK); } else { /* XXX firstly draw a little rect to help identify that it's different from the toggles */ @@ -800,7 +800,7 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View glEnd(); /* 'push down' icon for normal active-actions */ - UI_icon_draw((float)v2d->cur.xmax - offset, ydatac, ICON_FREEZE); + UI_icon_draw((float)v2d->cur.xmax - offset, ydatac, ICON_NLA_PUSHDOWN); } } -- cgit v1.2.3