[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38320] branches/soc-2011-pepper/source/ blender/editors: Bugfix [#27650] graph editor -> drivers -> Delete Channels (X) deletes

[Joshua Leung]

Revision: 38320
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38320
Author:   aligorith
Date:     2011-07-12 03:59:06 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Bugfix [#27650] graph editor -> drivers -> Delete Channels (X) deletes
wrong entries if obdata selected

In this case, the problem was that there were some lingering F-Curves
that were unselected by still had "active" flags set (a problem caused
by the old filtering channel visible vs list visible bug). Now,
"active" flag is treated separately from "selected" flag (bringing
this back into line with bones), leaving no confusion.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h

Modified: branches/soc-2011-pepper/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/animation/anim_channels_defines.c	2011-07-12 03:02:53 UTC (rev 38319)
+++ branches/soc-2011-pepper/source/blender/editors/animation/anim_channels_defines.c	2011-07-12 03:59:06 UTC (rev 38320)
@@ -2655,6 +2655,7 @@
 		char name[ANIM_CHAN_NAME_SIZE]; /* hopefully this will be enough! */
 		
 		/* set text color */
+		// XXX: if active, highlight differently?
 		if (selected)
 			UI_ThemeColor(TH_TEXT_HI);
 		else

Modified: branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h	2011-07-12 03:02:53 UTC (rev 38319)
+++ branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h	2011-07-12 03:59:06 UTC (rev 38320)
@@ -263,7 +263,7 @@
 #define SEL_AGRP(agrp) ((agrp->flag & AGRP_SELECTED) || (agrp->flag & AGRP_ACTIVE))
 	/* F-Curve Channels */
 #define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED)==0)
-#define SEL_FCU(fcu) (fcu->flag & (FCURVE_ACTIVE|FCURVE_SELECTED))
+#define SEL_FCU(fcu) (fcu->flag & FCURVE_SELECTED)
 
 /* ShapeKey mode only */
 #define EDITABLE_SHAPEKEY(kb) ((kb->flag & KEYBLOCK_LOCKED)==0)