[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17353] branches/animsys2/source/blender/ src/editaction.c: AnimSys2: DopeSheet bugfixes (I)

[Joshua Leung]

Revision: 17353
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17353
Author:   aligorith
Date:     2008-11-07 04:34:32 +0100 (Fri, 07 Nov 2008)

Log Message:
-----------
AnimSys2: DopeSheet bugfixes (I)

Fixed selection problems and crashes with Object->IPO keyframes

Modified Paths:
--------------
    branches/animsys2/source/blender/src/editaction.c

Modified: branches/animsys2/source/blender/src/editaction.c
===================================================================
--- branches/animsys2/source/blender/src/editaction.c	2008-11-07 02:58:25 UTC (rev 17352)
+++ branches/animsys2/source/blender/src/editaction.c	2008-11-07 03:34:32 UTC (rev 17353)
@@ -655,17 +655,15 @@
 	}
 	
 	/* if collapsed, don't go any further (unless adding keyframes only) */
-	if (EXPANDED_OBJC(ob) == 0 && (filter_mode & ACTFILTER_ONLYICU)==0) {
-		if ( !(filter_mode & ACTFILTER_IPOKEYS) )
-			return;
-	}
+	if ( (EXPANDED_OBJC(ob) == 0) && !(filter_mode & (ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU)) )
+		return;
 	
 	/* IPO? */
 	if (ob->ipo) {
 		IpoCurve *icu;
 		
 		/* include ipo-expand widget? */
-		if ((filter_mode & ACTFILTER_CHANNELS) && (filter_mode & ACTFILTER_ONLYICU)==0) {
+		if (filter_mode & (ACTFILTER_CHANNELS|ACTFILTER_IPOKEYS)) {
 			ale= make_new_actlistelem(ob, ACTTYPE_FILLIPOD, base, ACTTYPE_OBJECT);
 			if (ale) BLI_addtail(act_data, ale);
 		}
@@ -685,7 +683,7 @@
 	/* Action? */
 	if (ob->action) {
 		/* include action-expand widget? */
-		if ((filter_mode & ACTFILTER_CHANNELS) && (filter_mode & ACTFILTER_ONLYICU)==0) {
+		if ((filter_mode & ACTFILTER_CHANNELS) && !(filter_mode & (ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU))) {
 			ale= make_new_actlistelem(ob->action, ACTTYPE_FILLACTD, base, ACTTYPE_OBJECT);
 			if (ale) BLI_addtail(act_data, ale);
 		}
@@ -4253,7 +4251,7 @@
 				act= (bAction *)act_channel;
 				break;
 			case ACTTYPE_FILLIPOD:
-				ipo= (Ipo *)act_channel;
+				ipo= ((Object *)act_channel)->ipo;
 				break;
 			case ACTTYPE_OBJECT:
 				ob= ((Base *)act_channel)->object;