diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-01-26 07:13:38 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-01-26 07:13:38 +0300 |
| commit | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (patch) | |
| tree | f5d898a69b7ea9b098a667a030ddaa66e3f531af /source/blender/editors/space_action/action_draw.c | |
| parent | 3d39996f0fb6dcde3ad91cf7556b8175b0effbd9 (diff) | |
2.5 DopeSheet/Action Editor
* Made the various datatypes in the DopeSheet get shown again (NOTE: some of the types that don't get conversions to Animato yet may need some further checking).
* Did some code cleanup to allow F-Curve channels to always show RNA-based names correctly
Diffstat (limited to 'source/blender/editors/space_action/action_draw.c')
| -rw-r--r-- | source/blender/editors/space_action/action_draw.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index de7453654ff..227881408a0 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -409,7 +409,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) /* build list of channels to draw */ filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS); - items= ANIM_animdata_filter(&anim_data, filter, ac->data, ac->datatype); + items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); /* Update max-extent of channels here (taking into account scrollers): * - this is done to allow the channel list to be scrollable, but must be done here @@ -622,15 +622,20 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) //group= (ale->grp) ? 1 : 0; //grp= ale->grp; - // XXX this needs to be more detailed... - if (ale->id) { - if (GS(ale->id->name) == ID_MA) + switch (ale->ownertype) { + case ANIMTYPE_NONE: /* no owner */ + case ANIMTYPE_FCURVE: + offset= 0; + break; + + case ANIMTYPE_DSMAT: /* for now, this is special case for materials */ offset= 21; - else + break; + + default: offset= 14; + break; } - else - offset= 0; if (fcu->flag & FCURVE_MUTED) mute = ICON_MUTE_IPO_ON; @@ -988,7 +993,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar) /* build list of channels to draw */ filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS); - items= ANIM_animdata_filter(&anim_data, filter, ac->data, ac->datatype); + items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); /* Update max-extent of channels here (taking into account scrollers): * - this is done to allow the channel list to be scrollable, but must be done here |