[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23504] trunk/blender/source/blender/ editors/animation/anim_filter.c: Bugfix: Shapekey NLA Tracks were shown mixed with the ones for Objects

[Joshua Leung]

Revision: 23504
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23504
Author:   aligorith
Date:     2009-09-27 08:27:45 +0200 (Sun, 27 Sep 2009)

Log Message:
-----------
Bugfix: Shapekey NLA Tracks were shown mixed with the ones for Objects

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_filter.c

Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c	2009-09-27 06:14:42 UTC (rev 23503)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2009-09-27 06:27:45 UTC (rev 23504)
@@ -1226,8 +1226,21 @@
 		ANIMDATA_FILTER_CASES(key,
 			{ /* AnimData blocks - do nothing... */ },
 			{ /* nla */
-				/* add NLA tracks */
-				items += animdata_filter_nla(anim_data, adt, filter_mode, ob, ANIMTYPE_OBJECT, (ID *)ob);
+				/* include shapekey-expand widget? */
+				if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+					/* check if filtering by active status */
+					if ANIMCHANNEL_ACTIVEOK(key) {
+						ale= make_new_animlistelem(key, ANIMTYPE_DSSKEY, base, ANIMTYPE_OBJECT, (ID *)ob);
+						if (ale) {
+							BLI_addtail(anim_data, ale);
+							items++;
+						}
+					}
+				}
+				
+				/* add NLA tracks - only if expanded or so */
+				if (FILTER_SKE_OBJD(key) || (filter_mode & ANIMFILTER_CURVESONLY))
+					items += animdata_filter_nla(anim_data, adt, filter_mode, ob, ANIMTYPE_OBJECT, (ID *)ob);
 			},
 			{ /* drivers */
 				/* include shapekey-expand widget? */