[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26700] trunk/blender/source/blender/ editors: Small assorted harmless code cleanup tweaks before a round of cleanups aimed at fixing a few bugs in animation editor filtering .

[Joshua Leung]

Revision: 26700
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26700
Author:   aligorith
Date:     2010-02-08 11:27:10 +0100 (Mon, 08 Feb 2010)

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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/space_nla/nla_channels.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2010-02-08 10:12:02 UTC (rev 26699)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2010-02-08 10:27:10 UTC (rev 26700)
@@ -2074,7 +2074,7 @@
 		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;

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2010-02-08 10:12:02 UTC (rev 26699)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2010-02-08 10:27:10 UTC (rev 26700)
@@ -1795,7 +1795,7 @@
 		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)) {

Modified: trunk/blender/source/blender/editors/space_nla/nla_channels.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_channels.c	2010-02-08 10:12:02 UTC (rev 26699)
+++ trunk/blender/source/blender/editors/space_nla/nla_channels.c	2010-02-08 10:27:10 UTC (rev 26700)
@@ -279,7 +279,7 @@
 			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) {