diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-08 13:27:10 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-08 13:27:10 +0300 |
| commit | 23c070dd41138cc973e8e64f87dfa3c9eb629939 (patch) | |
| tree | 8a926e99ddc6f716627a647f6676e4706b038c29 /source/blender/editors | |
| parent | 7f3e8b6da8e03e9cb3c47ce8eef92e532a86eed5 (diff) | |
Small assorted harmless code cleanup tweaks before a round of cleanups aimed at fixing a few bugs in animation editor filtering.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 8463fe5840e..84be7049f7b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2074,7 +2074,7 @@ static void dummy_olddraw_gpencil () case ANIMTYPE_GPDATABLOCK: /* gpencil datablock */ { bGPdata *gpd = (bGPdata *)ale->data; - ScrArea *sa = (ScrArea *)ale->owner; + ScrArea *sa = (ScrArea *)ale->owner; // XXX depreceated... indent = 0; group= 3; diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index e2186f8e385..9448db3ebe3 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1795,7 +1795,7 @@ static int mouse_anim_channels (bAnimContext *ac, float x, int channel_index, sh case ANIMTYPE_GPLAYER: { #if 0 // XXX future of this is unclear - bGPdata *gpd= (bGPdata *)ale->owner; + bGPdata *gpd= (bGPdata *)ale->owner; // xxx depreceated bGPDlayer *gpl= (bGPDlayer *)ale->data; if (x >= (ACHANNEL_NAMEWIDTH-16)) { diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 3d20cfe54ba..885521fe8c0 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -279,7 +279,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho break; case ANIMTYPE_NLAACTION: { - AnimData *adt= BKE_animdata_from_id(ale->owner); /* this won't crash, right? */ + AnimData *adt= BKE_animdata_from_id(ale->id); if (x >= (v2d->cur.xmax-NLACHANNEL_BUTTON_WIDTH)) { if (nlaedit_is_tweakmode_on(ac) == 0) { |