[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26727] trunk/blender/source/blender/ editors/animation/anim_filter.c: Bugfix #21030: Non-visible animation channel-groups can get deleted

[Joshua Leung]

Revision: 26727
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26727
Author:   aligorith
Date:     2010-02-09 06:45:02 +0100 (Tue, 09 Feb 2010)

Log Message:
-----------
Bugfix #21030: Non-visible animation channel-groups can get deleted
Bugfix #21031: Non-visible animation channels affected by fcurve visibility toggle hotkeys

Removed a bad check for the selection filtering check from animation editor filtering for groups+fcurves. This check meant that groups that were not visible due to not having any visible F-Curves would end up being shown too.

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	2010-02-09 00:02:22 UTC (rev 26726)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2010-02-09 05:45:02 UTC (rev 26727)
@@ -471,6 +471,7 @@
 		ale->data= data;
 		ale->type= datatype;
 			// XXX what is the point of the owner data?
+			// xxx try and use this to simplify the problem of finding whether parent channels are working...
 		ale->owner= owner;
 		ale->ownertype= ownertype;
 		
@@ -938,16 +939,10 @@
 		/* get the first F-Curve in this group we can start to use, 
 		 * and if there isn't any F-Curve to start from, then don't 
 		 * this group at all...
-		 *
-		 * exceptions for when we might not care whether there's anything inside this group or not
-		 *	- if we're interested in channels and their selections, in which case group channel should get considered too
-		 *	  even if all its sub channels are hidden...
 		 */
 		first_fcu = animdata_filter_fcurve_next(ads, agrp->channels.first, agrp, filter_mode, owner_id);
 		
-		if ( (filter_mode & (ANIMFILTER_SEL|ANIMFILTER_UNSEL)) ||
-			 (first_fcu) ) 
-		{
+		if (first_fcu) {
 			/* add this group as a channel first */
 			if ((filter_mode & ANIMFILTER_CHANNELS) || !(filter_mode & ANIMFILTER_CURVESONLY)) {
 				/* check if filtering by selection */