diff options
author | Joshua Leung <aligorith@gmail.com> | 2014-05-04 11:19:39 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2014-05-04 11:19:39 +0400 |
commit | 2812e6a069f71676ac87fc9328b611aee9467c35 (patch) | |
tree | 2d4aca44b7a4d7231a407ae3c59493aff84d36d9 /source/blender/editors | |
parent | 91f90f61d39f261b9984d3305566f53fc06984dd (diff) |
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.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 9 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index eeb54986034..c776026a811 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -616,9 +616,7 @@ DEF_ICON(NEXT_KEYFRAME) DEF_ICON(PLAY_AUDIO) DEF_ICON(PLAY_REVERSE) DEF_ICON(PREVIEW_RANGE) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK180) -#endif +DEF_ICON(ACTION_TWEAK) DEF_ICON(PMARKER_ACT) DEF_ICON(PMARKER_SEL) DEF_ICON(PMARKER) @@ -640,10 +638,7 @@ DEF_ICON(SOLO_OFF) DEF_ICON(SOLO_ON) DEF_ICON(FRAME_PREV) DEF_ICON(FRAME_NEXT) -#ifndef DEF_ICON_BLANK_SKIP - /* available */ - DEF_ICON(BLANK186) -#endif +DEF_ICON(NLA_PUSHDOWN) DEF_ICON(IPO_CONSTANT) DEF_ICON(IPO_LINEAR) DEF_ICON(IPO_BEZIER) 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); } } |