Small assorted harmless code cleanup tweaks before a round of cleanups aimed at fixing a few bugs in animation editor filtering.

This commit is contained in:
Joshua Leung
2010-02-08 10:27:10 +00:00
parent 7f3e8b6da8
commit 23c070dd41
3 changed files with 3 additions and 3 deletions

View File

@@ -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;

View File

@@ -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)) {

View File

@@ -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) {