diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-12-22 13:15:02 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-12-22 13:15:02 +0300 |
| commit | cedb19ef3edcac962af8b0f661411a7e019b53c4 (patch) | |
| tree | 8e4675a40ae303220b0f3fba9cc598bd87dce101 /source/blender/editors/space_action/action_draw.c | |
| parent | bac4d10174da530427343e6238be16b8a8ee3ac8 (diff) | |
2.5 - Animation tweaks - bringing back more code
* Action Editor - IPO curve names are shown properly again. Added anim_ipo_utils.c (old editipo_lib.c) file back. This will need to be removed when I port IPO system to RNA.
* Keyframing code - uncommented more of the code that's now working
* Made the 'preview range' button on timeline header draw more clearly
Diffstat (limited to 'source/blender/editors/space_action/action_draw.c')
| -rw-r--r-- | source/blender/editors/space_action/action_draw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 980f6900d27..7a99b151148 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -730,11 +730,10 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) mute = ICON_MUTE_IPO_OFF; sel = SEL_ICU(icu); - //if (saction->pin) - // sprintf(name, getname_ipocurve(icu, NULL)); // xxx func to eventually eliminate - //else - // sprintf(name, getname_ipocurve(icu, ac->obact)); // xxx func to eventually eliminate - sprintf(name, "[IPO Curve]"); // FIXME xxx + if (saction->pin) + sprintf(name, getname_ipocurve(icu, NULL)); // xxx func to eventually eliminate + else + sprintf(name, getname_ipocurve(icu, ac->obact)); // xxx func to eventually eliminate } break; case ANIMTYPE_FILLIPO: /* ipo expand widget */ @@ -742,7 +741,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) bActionChannel *achan = (bActionChannel *)ale->data; indent = 1; - //special = geticon_ipo_blocktype(achan->ipo->blocktype); // xxx func to eventually eliminate + special = geticon_ipo_blocktype(achan->ipo->blocktype); // xxx func to eventually eliminate group= (ale->grp) ? 1 : 0; grp= ale->grp; @@ -817,7 +816,8 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) case SPACE_VIEW3D: { /* this shouldn't cause any overflow... */ - //sprintf(name, "3DView[%02d]:%s", sa->win, view3d_get_name(sa->spacedata.first)); // XXX missing func.. + //sprintf(name, "3DView:%s", view3d_get_name(sa->spacedata.first)); // XXX missing func.. + sprintf(name, "3dView"); special= ICON_VIEW3D; } break; |