[Bf-blender-cvs] [be7b09e] master: NLA Editor: Display "tweaking action" status indicator icon in place of action-type icon

Joshua Leung noreply at git.blender.org
Sun May 4 14:24:04 CEST 2014


Commit: be7b09ef85d7d08d7c2b53cca474c338657f4478
Author: Joshua Leung
Date:   Sun May 4 19:28:14 2014 +1200
https://developer.blender.org/rBbe7b09ef85d7d08d7c2b53cca474c338657f4478

NLA Editor: Display "tweaking action" status indicator icon in place of action-type icon

Instead of displaying the "tweaking action" status indicator icon on the right hand
side jammed against the mapping/no-mapping toggle (pin), this is now displayed as in
place of the action icon used on the left (as the type indicator). This is less messy
than the previous situation, which was needed partly due to the abuse of an unsuited
icon.

===================================================================

M	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 a76612b..2e12ca6 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -652,7 +652,11 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
 					
 					group = 5;
 					
-					special = ICON_ACTION;
+					/* indicate tweaking-action state by changing the icon... */
+					if ((adt) && (adt->flag & ADT_NLA_EDIT_ON))
+						special = ICON_ACTION_TWEAK;
+					else
+						special = ICON_ACTION;
 					
 					BLI_strncpy(name, act ? act->id.name + 2 : "<No Action>", sizeof(name));
 
@@ -782,13 +786,6 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
 							UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_PINNED);
 						else
 							UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_UNPINNED);
-						
-						fdrawline((float)(v2d->cur.xmax - offset), yminc,
-						          (float)(v2d->cur.xmax - offset), ymaxc);
-						offset += 0.8f * U.widget_unit;
-						
-						/* 'tweaking action' indicator - not a button */
-						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 */




More information about the Bf-blender-cvs mailing list