Animation Channel Filtering Refactor - Part 3 (Visibility Flag Split)
authorJoshua Leung <aligorith@gmail.com>
Wed, 22 Jun 2011 11:41:26 +0000 (11:41 +0000)
committerJoshua Leung <aligorith@gmail.com>
Wed, 22 Jun 2011 11:41:26 +0000 (11:41 +0000)
* This (big) commit is aimed at cleaning up the filtering flags used
by the animation channel filtering code. The list of filtering flags
has been growing a bit "organically" since it's humble origins for use
in the Action Editor some 3 years (IIRC) ago now during a weekend
hackathon. Obviously, some things have ended up tacked on, while
others have been the product of other flag options. Nevertheless, it
was time for a bit of a spring clean!

* Most notably, one area where the system outgrown its original design
for the Action Editor was in terms of the "visibility" filtering flag
it was using. While in the Action Editor the concept of what channels
to include was strictly dictated by whether the channel hierarchy
showed it, in the Graph Editor this is not always the case. In other
words, there was a difference between the data the channels
represented being visible and the channels for that data being visible
in the hierarchy.

Long story short: this lead to bug report [#27076] (and many like it),
where if you selected an F-Curve, then collapsed the Group it was in,
then even after selecting another F-Curve in another Group, the
original F-Curve's properties would still be shown in the Properties
Region. The good news is that this commit fixes this issue right away!

* More good news will follow, as I start checking on the flag usage of
other tools, but I'm committing this first so that we have a stable
reference (of code similar to the old buggy stuff) on which we can
fall back to later to find bugs (should they pop up).

Anyways, back to the trenches!

22 files changed:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_graph/graph_utils.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_nla/nla_select.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c

index c71ffe9cd5eadea81ae6f74204a4f351a37767eb..c3e79d787e1549679eacee3d1dce68e70ecf9eb3 100644 (file)
@@ -2735,11 +2735,8 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
        else
                return;
        
-       /* get all channels that can possibly be chosen 
-        *      - therefore, the filter is simply ANIMFILTER_CHANNELS, since if we took VISIBLE too,
-        *        then the channels under closed expanders get ignored...
-        */
-       filter= ANIMFILTER_CHANNELS;
+       /* get all channels that can possibly be chosen - but ignore hierarchy */
+       filter= ANIMFILTER_DATA_VISIBLE|ANIMFILTER_LIST_CHANNELS;
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* call API method to flush the setting */
index 9eb9e3ecd9a7b969c9334cb4f4019cae975a721d..fa52bdcb8543a0b758658333ce98973fcb61d3eb 100644 (file)
@@ -194,7 +194,8 @@ void ANIM_deselect_anim_channels (bAnimContext *ac, void *data, short datatype,
        int filter;
        
        /* filter data */
-       filter= ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS;
+       /* NOTE: no list visible, otherwise, we get dangling */
+       filter= ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS;
        ANIM_animdata_filter(ac, &anim_data, filter, data, datatype);
        
        /* See if we should be selecting or deselecting */
@@ -1053,7 +1054,8 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op)
        mode= RNA_enum_get(op->ptr, "direction");
        
        /* get animdata blocks */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA);
+       // XXX: hierarchy visibility is provisional atm... might be wrong decision!
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale = anim_data.first; ale; ale = ale->next) {
@@ -1133,7 +1135,7 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
        /* do groups only first (unless in Drivers mode, where there are none) */
        if (ac.datatype != ANIMCONT_DRIVERS) {
                /* filter data */
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_CHANNELS | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
                ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
                
                /* delete selected groups and their associated channels */
@@ -1172,7 +1174,7 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
        /* now do F-Curves */
        if (ac.datatype != ANIMCONT_GPENCIL) {
                /* filter data */
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
                ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
                
                /* delete selected F-Curves */
@@ -1227,12 +1229,16 @@ static int animchannels_visibility_set_exec(bContext *C, wmOperator *UNUSED(op))
        if (ANIM_animdata_get_context(C, &ac) == 0)
                return OPERATOR_CANCELLED;
        
-       /* get list of all channels that selection may need to be flushed to */
-       filter= ANIMFILTER_CHANNELS;
+       /* get list of all channels that selection may need to be flushed to 
+        * - hierarchy mustn't affect what we have access to here...
+        */
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &all_data, filter, ac.data, ac.datatype);
-       
-       /* hide all channels not selected */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_UNSEL | ANIMFILTER_NODUPLIS);
+               
+       /* hide all channels not selected
+        * - restrict this to only applying on settings we can get to in the list
+        */
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_UNSEL | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -1306,12 +1312,16 @@ static int animchannels_visibility_toggle_exec(bContext *C, wmOperator *UNUSED(o
        if (ANIM_animdata_get_context(C, &ac) == 0)
                return OPERATOR_CANCELLED;
                
-       /* get list of all channels that selection may need to be flushed to */
-       filter= (ANIMFILTER_CHANNELS | ANIMFILTER_NODUPLIS);
+       /* get list of all channels that selection may need to be flushed to 
+        * - hierarchy mustn't affect what we have access to here...
+        */
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &all_data, filter, ac.data, ac.datatype);
                
-       /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_NODUPLIS);
+       /* filter data
+        * - restrict this to only applying on settings we can get to in the list
+        */
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* See if we should be making showing all selected or hiding */
@@ -1403,14 +1413,24 @@ static void setflag_anim_channels (bAnimContext *ac, short setting, short mode,
        
        /* filter data that we need if flush is on */
        if (flush) {
-               /* get list of all channels that selection may need to be flushed to */
-               filter= ANIMFILTER_CHANNELS;
+               /* get list of all channels that selection may need to be flushed to 
+                * - hierarchy visibility needs to be ignored so that settings can get flushed
+                *   "down" inside closed containers
+                */
+               filter= ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS;
                ANIM_animdata_filter(ac, &all_data, filter, ac->data, ac->datatype);
        }
        
-       /* filter data that we're working on */
+       /* filter data that we're working on 
+        * - hierarchy matters if we're doing this from the channels region
+        *   since we only want to apply this to channels we can "see", 
+        *   and have these affect their relatives
+        * - but for Graph Editor, this gets used also from main region
+        *   where hierarchy doesn't apply [#21276]
+        */
+       // FIXME: graph editor case
        // XXX: noduplis enabled so that results don't cancel, but will be problematic for some channels where only type differs
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_NODUPLIS);
        if (onlysel) filter |= ANIMFILTER_SEL;
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
@@ -1703,7 +1723,7 @@ static int animchannels_enable_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* loop through filtered data and clean curves */
@@ -1812,7 +1832,7 @@ static void borderselect_anim_channels (bAnimContext *ac, rcti *rect, short sele
        UI_view2d_region_to_view(v2d, rect->xmax, rect->ymax-2, &rectf.xmax, &rectf.ymax);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop over data, doing border select */
@@ -1926,7 +1946,7 @@ static int mouse_anim_channels (bAnimContext *ac, float UNUSED(x), int channel_i
        
        /* get the channel that was clicked on */
                /* filter channels */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
                /* get channel from index */
index b5a1781064c6e047f13d8b3e4042c4f4473757cc..130611139262208a9626f91a9dfa277f4dcff259 100644 (file)
@@ -257,7 +257,7 @@ void ANIM_sync_animchannels_to_data (const bContext *C)
        
        /* filter data */
                /* NOTE: we want all channels, since we want to be able to set selection status on some of them even when collapsed */
-       filter= ANIMFILTER_CHANNELS;
+       filter= ANIMFILTER_DATA_VISIBLE|ANIMFILTER_LIST_CHANNELS;
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* flush settings as appropriate depending on the types of the channels */
index 2343c73921c88c90f55b5468358b3f7b8c29740d..04d8aa87e14f978c31f951f1fd75e747567844ba 100644 (file)
@@ -369,7 +369,7 @@ short ANIM_animdata_get_context (const bContext *C, bAnimContext *ac)
 #define ANIMDATA_FILTER_CASES(id, adtOk, nlaOk, driversOk, keysOk) \
        {\
                if ((id)->adt) {\
-                       if (!(filter_mode & ANIMFILTER_CURVEVISIBLE) || !((id)->adt->flag & ADT_CURVES_NOT_VISIBLE)) {\
+                       if (!(filter_mode & ANIMFILTER_CURVE_VISIBLE) || !((id)->adt->flag & ADT_CURVES_NOT_VISIBLE)) {\
                                if (filter_mode & ANIMFILTER_ANIMDATA) {\
                                        adtOk\
                                }\
@@ -774,11 +774,12 @@ static size_t skip_fcurve_selected_data (bDopeSheet *ads, FCurve *fcu, ID *owner
                        /* check whether to continue or skip */
                        if ((pchan) && (pchan->bone)) {
                                /* if only visible channels, skip if bone not visible unless user wants channels from hidden data too */
-                               if ((filter_mode & ANIMFILTER_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
+                               if ((filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
                                        bArmature *arm= (bArmature *)ob->data;
                                        
                                        if ((arm->layer & pchan->bone->layer) == 0)
                                                return 1;
+                                       // TODO: manually hidden using flags
                                }
                                
                                /* can only add this F-Curve if it is selected */
@@ -881,7 +882,7 @@ static FCurve *animdata_filter_fcurve_next (bDopeSheet *ads, FCurve *first, bAct
                }
                
                /* only include if visible (Graph Editor check, not channels check) */
-               if (!(filter_mode & ANIMFILTER_CURVEVISIBLE) || (fcu->flag & FCURVE_VISIBLE)) {
+               if (!(filter_mode & ANIMFILTER_CURVE_VISIBLE) || (fcu->flag & FCURVE_VISIBLE)) {
                        /* only work with this channel and its subchannels if it is editable */
                        if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_FCU(fcu)) {
                                /* only include this curve if selected in a way consistent with the filtering requirements */
@@ -1003,7 +1004,7 @@ static size_t animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDo
                 */
                if (first_fcu) {
                        /* add this group as a channel first */
-                       if ((filter_mode & ANIMFILTER_CHANNELS) || !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                /* filter selection of channel specially here again, since may be open and not subject to previous test */
                                if ( ANIMCHANNEL_SELOK(SEL_AGRP(agrp)) ) {
                                        ale= make_new_animlistelem(agrp, ANIMTYPE_GROUP, owner_id);
@@ -1021,17 +1022,16 @@ static size_t animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDo
                                 *      - groups can be collapsed (and those tools which are only interested in channels rely on knowing that group is closed)
                                 *
                                 * cases when we should include F-Curves inside group:
-                                *      - we don't care about visibility
+                                *      - we don't care about hierarchy visibility (i.e. we just need the F-Curves present)
                                 *      - group is expanded
-                                *      - we just need the F-Curves present
                                 */
-                               if ( (!(filter_mode & ANIMFILTER_VISIBLE) || EXPANDED_AGRP(ac, agrp)) || (filter_mode & ANIMFILTER_CURVESONLY) )
+                               if ( (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || EXPANDED_AGRP(ac, agrp)) )
                                {
                                        /* for the Graph Editor, curves may be set to not be visible in the view to lessen clutter,
                                         * but to do this, we need to check that the group doesn't have it's not-visible flag set preventing 
                                         * all its sub-curves to be shown
                                         */
-                                       if ( !(filter_mode & ANIMFILTER_CURVEVISIBLE) || !(agrp->flag & AGRP_NOTVISIBLE) )
+                                       if ( !(filter_mode & ANIMFILTER_CURVE_VISIBLE) || !(agrp->flag & AGRP_NOTVISIBLE) )
                                        {
                                                if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_AGRP(agrp)) {
                                                        /* NOTE: filter_gmode is used here, not standard filter_mode, since there may be some flags that shouldn't apply */
@@ -1054,7 +1054,7 @@ static size_t animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDo
 }
 
 /* Include NLA-Data for NLA-Editor:
- *     - when ANIMFILTER_CHANNELS is used, that means we should be filtering the list for display
+ *     - when ANIMFILTER_LIST_CHANNELS is used, that means we should be filtering the list for display
  *       Although the evaluation order is from the first track to the last and then apply the Action on top,
  *       we present this in the UI as the Active Action followed by the last track to the first so that we 
  *       get the evaluation order presented as per a stack.
@@ -1069,7 +1069,7 @@ static size_t animdata_filter_nla (bAnimContext *UNUSED(ac), ListBase *anim_data
        size_t items = 0;
        
        /* if showing channels, include active action */
-       if (filter_mode & ANIMFILTER_CHANNELS) {
+       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                /* there isn't really anything editable here, so skip if need editable */
                // TODO: currently, selection isn't checked since it doesn't matter
                if ((filter_mode & ANIMFILTER_FOREDIT) == 0) { 
@@ -1097,7 +1097,7 @@ static size_t animdata_filter_nla (bAnimContext *UNUSED(ac), ListBase *anim_data
        /* loop over NLA Tracks - assume that the caller of this has already checked that these should be included */
        for (nlt= first; nlt; nlt= next) {
                /* 'next' NLA-Track to use depends on whether we're filtering for drawing or not */
-               if (filter_mode & ANIMFILTER_CHANNELS) 
+               if (filter_mode & ANIMFILTER_LIST_CHANNELS) 
                        next= nlt->prev;
                else
                        next= nlt->next;
@@ -1137,7 +1137,7 @@ static size_t animdata_filter_shapekey (bAnimContext *ac, ListBase *anim_data, K
        size_t items = 0;
        
        /* check if channels or only F-Curves */
-       if ((filter_mode & ANIMFILTER_CURVESONLY) == 0) {
+       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                KeyBlock *kb;
                
                /* loop through the channels adding ShapeKeys as appropriate */
@@ -1165,7 +1165,7 @@ static size_t animdata_filter_shapekey (bAnimContext *ac, ListBase *anim_data, K
        }
        else {
                /* just use the action associated with the shapekey */
-               // FIXME: is owner-id and having no owner/dopesheet really fine?
+               // TODO: somehow manage to pass dopesheet info down here too?
                if (key->adt) {
                        if (filter_mode & ANIMFILTER_ANIMDATA)
                                ANIMDATA_ADD_ANIMDATA(key)
@@ -1188,7 +1188,6 @@ static size_t animdata_filter_gpencil (ListBase *anim_data, void *UNUSED(data),
        size_t items = 0;
        
        /* check if filtering types are appropriate */
-       if (!(filter_mode & (ANIMFILTER_ACTGROUPED|ANIMFILTER_CURVESONLY)))
        {
                /* for now, grab grease pencil datablocks directly from main*/
                for (gpd = G.main->gpencil.first; gpd; gpd = gpd->id.next) {
@@ -1197,7 +1196,7 @@ static size_t animdata_filter_gpencil (ListBase *anim_data, void *UNUSED(data),
                                continue;
                        
                        /* add gpd as channel too (if for drawing, and it has layers) */
-                       if ((filter_mode & ANIMFILTER_CHANNELS) && (gpd->layers.first)) {
+                       if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && (gpd->layers.first)) {
                                /* add to list */
                                ale= make_new_animlistelem(gpd, ANIMTYPE_GPDATABLOCK, NULL);
                                if (ale) {
@@ -1207,7 +1206,7 @@ static size_t animdata_filter_gpencil (ListBase *anim_data, void *UNUSED(data),
                        }
                        
                        /* only add layers if they will be visible (if drawing channels) */
-                       if ( !(filter_mode & ANIMFILTER_VISIBLE) || (EXPANDED_GPD(gpd)) ) {
+                       if ( !(filter_mode & ANIMFILTER_LIST_VISIBLE) || (EXPANDED_GPD(gpd)) ) {
                                /* loop over layers as the conditions are acceptable */
                                for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
                                        /* only if selected */
@@ -1292,7 +1291,7 @@ static size_t animdata_filter_dopesheet_texs (bAnimContext *ac, ListBase *anim_d
                if (ok == 0) continue;
                
                /* include texture-expand widget? */
-               if (filter_mode & ANIMFILTER_CHANNELS) {
+               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                        /* check if filtering by active status */
                        if ANIMCHANNEL_ACTIVEOK(tex) {
                                ale= make_new_animlistelem(tex, ANIMTYPE_DSTEX, owner_id);
@@ -1304,7 +1303,7 @@ static size_t animdata_filter_dopesheet_texs (bAnimContext *ac, ListBase *anim_d
                }
                
                /* add texture's animation data */
-               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_TEX_DATA(tex) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_TEX_DATA(tex)) {
                        ANIMDATA_FILTER_CASES(tex, 
                                { /* AnimData blocks - do nothing... */ },
                                items += animdata_filter_nla(ac, anim_data, ads, tex->adt, filter_mode, (ID *)tex);, 
@@ -1362,7 +1361,7 @@ static size_t animdata_filter_dopesheet_mats (bAnimContext *ac, ListBase *anim_d
                
                /* include material-expand widget? */
                // hmm... do we need to store the index of this material in the array anywhere?
-               if (filter_mode & ANIMFILTER_CHANNELS) {
+               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                        /* check if filtering by active status */
                        if ANIMCHANNEL_ACTIVEOK(ma) {
                                ale= make_new_animlistelem(ma, ANIMTYPE_DSMAT, (ID *)ma);
@@ -1374,7 +1373,7 @@ static size_t animdata_filter_dopesheet_mats (bAnimContext *ac, ListBase *anim_d
                }
                
                /* add material's animation data */
-               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_MAT_OBJD(ma) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_MAT_OBJD(ma)) {
                        /* material's animation data */
                        ANIMDATA_FILTER_CASES(ma, 
                                { /* AnimData blocks - do nothing... */ },
@@ -1412,7 +1411,7 @@ static size_t animdata_filter_dopesheet_particles (bAnimContext *ac, ListBase *a
                if (ok == 0) continue;
                
                /* add particle settings? */
-               if ((filter_mode & ANIMFILTER_CHANNELS)) {
+               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                        /* check if filtering by active status */
                        if ANIMCHANNEL_ACTIVEOK(psys->part) {
                                ale = make_new_animlistelem(psys->part, ANIMTYPE_DSPART, (ID *)psys->part);
@@ -1423,7 +1422,7 @@ static size_t animdata_filter_dopesheet_particles (bAnimContext *ac, ListBase *a
                        }
                }
                
-               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_PART_OBJD(psys->part) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_PART_OBJD(psys->part)) {
                        ANIMDATA_FILTER_CASES(psys->part,
                                { /* AnimData blocks - do nothing... */ },
                                items += animdata_filter_nla(ac, anim_data, ads, psys->part->adt, filter_mode, (ID *)psys->part);, 
@@ -1507,7 +1506,7 @@ static size_t animdata_filter_dopesheet_obdata (bAnimContext *ac, ListBase *anim
        }
        
        /* include data-expand widget? */
-       if ((filter_mode & (ANIMFILTER_CURVESONLY|ANIMFILTER_NLATRACKS)) == 0) {        
+       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {   
                /* check if filtering by active status */
                if ANIMCHANNEL_ACTIVEOK(iat) {
                        ale= make_new_animlistelem(iat, type, (ID *)iat);
@@ -1516,7 +1515,7 @@ static size_t animdata_filter_dopesheet_obdata (bAnimContext *ac, ListBase *anim
        }
        
        /* add object-data animation channels? */
-       if (!(filter_mode & ANIMFILTER_VISIBLE) || (expanded) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+       if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || (expanded)) {
                /* filtering for channels - nla, drivers, keyframes */
                ANIMDATA_FILTER_CASES(iat, 
                        { /* AnimData blocks - do nothing... */ },
@@ -1550,7 +1549,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
        size_t items = 0;
        
        /* add this object as a channel first */
-       if ((filter_mode & (ANIMFILTER_CURVESONLY|ANIMFILTER_NLATRACKS)) == 0) {
+       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                /* check if filtering by selection */
                if ANIMCHANNEL_SELOK((base->flag & SELECT)) {
                        /* check if filtering by active status */
@@ -1565,8 +1564,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
        }
        
        /* if collapsed, don't go any further (unless adding keyframes only) */
-       if ( ((filter_mode & ANIMFILTER_VISIBLE) && EXPANDED_OBJC(ob) == 0) &&
-                !(filter_mode & (ANIMFILTER_CURVESONLY|ANIMFILTER_NLATRACKS)) )
+       if ((filter_mode & ANIMFILTER_LIST_VISIBLE) && EXPANDED_OBJC(ob) == 0)
                return items;
        
        /* Action, Drivers, or NLA */
@@ -1580,8 +1578,8 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                        },
                        { /* drivers */
                                /* include drivers-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
-                                       ale= make_new_animlistelem(adt->action, ANIMTYPE_FILLDRIVERS, (ID *)ob);
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
+                                       ale= make_new_animlistelem(adt, ANIMTYPE_FILLDRIVERS, (ID *)ob);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
                                                items++;
@@ -1589,13 +1587,13 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                                }
                                
                                /* add F-Curve channels (drivers are F-Curves) */
-                               if (!(filter_mode & ANIMFILTER_VISIBLE) || EXPANDED_DRVD(adt) || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || EXPANDED_DRVD(adt)) {
                                        items += animdata_filter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, (ID *)ob);
                                }
                        },
                        { /* action (keyframes) */
                                /* include action-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(adt->action, ANIMTYPE_FILLACTD, (ID *)ob);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1604,7 +1602,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                                }
                                
                                /* add F-Curve channels? */
-                               if (!(filter_mode & ANIMFILTER_VISIBLE) || EXPANDED_ACTC(adt->action) || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || EXPANDED_ACTC(adt->action)) {
                                        items += animdata_filter_action(ac, anim_data, ads, adt->action, filter_mode, (ID *)ob); 
                                }
                        }
@@ -1619,7 +1617,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                        { /* AnimData blocks - do nothing... */ },
                        { /* nla */
                                /* include shapekey-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        /* check if filtering by active status */
                                        if ANIMCHANNEL_ACTIVEOK(key) {
                                                ale= make_new_animlistelem(key, ANIMTYPE_DSSKEY, (ID *)ob);
@@ -1631,12 +1629,12 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                                }
                                
                                /* add NLA tracks - only if expanded or so */
-                               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_SKE_OBJD(key) || (filter_mode & ANIMFILTER_CURVESONLY))
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_SKE_OBJD(key))
                                        items += animdata_filter_nla(ac, anim_data, ads, adt, filter_mode, (ID *)key);
                        },
                        { /* drivers */
                                /* include shapekey-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(key, ANIMTYPE_DSSKEY, (ID *)ob);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1645,13 +1643,13 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                                }
                                
                                /* add channels */
-                               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_SKE_OBJD(key) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_SKE_OBJD(key)) {
                                        items += animdata_filter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, (ID *)key);
                                }
                        },
                        { /* action (keyframes) */
                                /* include shapekey-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        /* check if filtering by active status */
                                        if ANIMCHANNEL_ACTIVEOK(key) {
                                                ale= make_new_animlistelem(key, ANIMTYPE_DSSKEY, (ID *)ob);
@@ -1663,7 +1661,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat
                                }
                                
                                /* add channels */
-                               if (!(filter_mode & ANIMFILTER_VISIBLE) || FILTER_SKE_OBJD(key) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_SKE_OBJD(key)) {
                                        items += animdata_filter_action(ac, anim_data, ads, adt->action, filter_mode, (ID *)key); 
                                }
                        }
@@ -1790,7 +1788,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
        size_t items = 0;
        
        /* add scene as a channel first (even if we aren't showing scenes we still need to show the scene's sub-data */
-       if ((filter_mode & (ANIMFILTER_CURVESONLY|ANIMFILTER_NLATRACKS)) == 0) {
+       if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                /* check if filtering by selection */
                if (ANIMCHANNEL_SELOK( (sce->flag & SCE_DS_SELECTED) )) {
                        ale= make_new_animlistelem(sce, ANIMTYPE_SCENE, NULL);
@@ -1802,7 +1800,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
        }
        
        /* if collapsed, don't go any further (unless adding keyframes only) */
-       if ( (EXPANDED_SCEC(sce) == 0) && !(filter_mode & (ANIMFILTER_CURVESONLY|ANIMFILTER_NLATRACKS)) )
+       if ((filter_mode & ANIMFILTER_LIST_VISIBLE) && (EXPANDED_SCEC(sce) == 0))
                return items;
                
        /* Action, Drivers, or NLA for Scene */
@@ -1816,7 +1814,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                        },
                        { /* drivers */
                                /* include drivers-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(adt->action, ANIMTYPE_FILLDRIVERS, (ID *)sce);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1825,13 +1823,13 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add F-Curve channels (drivers are F-Curves) */
-                               if (EXPANDED_DRVD(adt) || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || EXPANDED_DRVD(adt)) {
                                        items += animdata_filter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, (ID *)sce);
                                }
                        },
                        { /* action */
                                /* include action-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(adt->action, ANIMTYPE_FILLACTD, (ID *)sce);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1840,7 +1838,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add F-Curve channels? */
-                               if (EXPANDED_ACTC(adt->action) || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || EXPANDED_ACTC(adt->action)) {
                                        items += animdata_filter_action(ac, anim_data, ads, adt->action, filter_mode, (ID *)sce); 
                                }
                        }
@@ -1859,7 +1857,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                        },
                        { /* drivers */
                                /* include world-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(wo, ANIMTYPE_DSWOR, (ID *)wo);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1868,14 +1866,14 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add F-Curve channels (drivers are F-Curves) */
-                               if (FILTER_WOR_SCED(wo)/*EXPANDED_DRVD(adt)*/ || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_WOR_SCED(wo)/*EXPANDED_DRVD(adt)*/) {
                                        // XXX owner info is messed up now...
                                        items += animdata_filter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, (ID *)wo);
                                }
                        },
                        { /* action */
                                /* include world-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(wo, ANIMTYPE_DSWOR, (ID *)sce);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1884,14 +1882,14 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add channels */
-                               if (FILTER_WOR_SCED(wo) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_WOR_SCED(wo)) {
                                        items += animdata_filter_action(ac, anim_data, ads, adt->action, filter_mode, (ID *)wo); 
                                }
                        }
                )
                
                /* if expanded, check world textures too */
-               if (FILTER_WOR_SCED(wo) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_WOR_SCED(wo)) {
                        /* textures for world */
                        if (!(ads->filterflag & ADS_FILTER_NOTEX))
                                items += animdata_filter_dopesheet_texs(ac, anim_data, ads, (ID *)wo, filter_mode);
@@ -1909,7 +1907,7 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                        },
                        { /* drivers */
                                /* include nodetree-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(ntree, ANIMTYPE_DSNTREE, (ID *)ntree);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1918,14 +1916,14 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add F-Curve channels (drivers are F-Curves) */
-                               if (FILTER_NTREE_SCED(ntree)/*EXPANDED_DRVD(adt)*/ || !(filter_mode & ANIMFILTER_CHANNELS)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_NTREE_SCED(ntree)/*EXPANDED_DRVD(adt)*/) {
                                        // XXX owner info is messed up now...
                                        items += animdata_filter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, (ID *)ntree);
                                }
                        },
                        { /* action */
                                /* include nodetree-expand widget? */
-                               if ((filter_mode & ANIMFILTER_CHANNELS) && !(filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                                        ale= make_new_animlistelem(ntree, ANIMTYPE_DSNTREE, (ID *)sce);
                                        if (ale) {
                                                BLI_addtail(anim_data, ale);
@@ -1934,15 +1932,12 @@ static size_t animdata_filter_dopesheet_scene (bAnimContext *ac, ListBase *anim_
                                }
                                
                                /* add channels */
-                               if (FILTER_NTREE_SCED(ntree) || (filter_mode & ANIMFILTER_CURVESONLY)) {
+                               if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || FILTER_NTREE_SCED(ntree)) {
                                        items += animdata_filter_action(ac, anim_data, ads, adt->action, filter_mode, (ID *)ntree); 
                                }
                        }
                )
        }
-
-       
-       // TODO: scene compositing nodes (these aren't standard node-trees)
        
        /* return the number of items added to the list */
        return items;
@@ -2019,7 +2014,7 @@ static size_t animdata_filter_dopesheet (bAnimContext *ac, ListBase *anim_data,
                /* if only F-Curves with visible flags set can be shown, check that 
                 * datablocks haven't been set to invisible 
                 */
-               if (filter_mode & ANIMFILTER_CURVEVISIBLE) {
+               if (filter_mode & ANIMFILTER_CURVE_VISIBLE) {
                        if ((sce->adt) && (sce->adt->flag & ADT_CURVES_NOT_VISIBLE))
                                sceOk= worOk= nodeOk= 0;
                }
@@ -2048,8 +2043,7 @@ static size_t animdata_filter_dopesheet (bAnimContext *ac, ListBase *anim_data,
                         *      - if only selected, must check if object is selected 
                         *      - there must be animation data to edit
                         */
-                       // TODO: if cache is implemented, just check name here, and then 
-                       if ((filter_mode & ANIMFILTER_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
+                       if ((filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
                                /* layer visibility - we check both object and base, since these may not be in sync yet */
                                if ((sce->lay & (ob->lay|base->lay))==0) continue;
                                
@@ -2060,7 +2054,7 @@ static size_t animdata_filter_dopesheet (bAnimContext *ac, ListBase *anim_data,
                        /* if only F-Curves with visible flags set can be shown, check that 
                         * datablock hasn't been set to invisible 
                         */
-                       if (filter_mode & ANIMFILTER_CURVEVISIBLE) {
+                       if (filter_mode & ANIMFILTER_CURVE_VISIBLE) {
                                if ((ob->adt) && (ob->adt->flag & ADT_CURVES_NOT_VISIBLE))
                                        continue;
                        }
@@ -2368,8 +2362,7 @@ static short animdata_filter_dopesheet_summary (bAnimContext *ac, ListBase *anim
         *      - only for drawing and/or selecting keyframes in channels, but not for real editing 
         *      - only useful for DopeSheet/Action/etc. editors where it is actually useful
         */
-       // TODO: we should really check if some other prohibited filters are also active, but that can be for later
-       if ((filter_mode & ANIMFILTER_CHANNELS) && (ads->filterflag & ADS_FILTER_SUMMARY)) {
+       if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && (ads->filterflag & ADS_FILTER_SUMMARY)) {
                bAnimListElem *ale= make_new_animlistelem(ac, ANIMTYPE_SUMMARY, NULL);
                if (ale) {
                        BLI_addtail(anim_data, ale);
index 00e11d8b1a43b0260c6d245622487f18213287b1..453027632eb63de9a3ac554348dabdc1584689a4 100644 (file)
@@ -773,7 +773,7 @@ void summary_to_keylist(bAnimContext *ac, DLRBT_Tree *keys, DLRBT_Tree *blocks)
                int filter;
                
                /* get F-Curves to take keyframes from */
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
+               filter= ANIMFILTER_DATA_VISIBLE; // curves only
                ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                
                /* loop through each F-Curve, grabbing the keyframes */
index e50203cbc2844f302a13bd91676f83feb0def996..ca8d1c232fa7f1f8534014f436c3df2adae7412c 100644 (file)
@@ -397,7 +397,7 @@ static short summary_keyframes_loop(KeyframeEditData *ked, bAnimContext *ac, Key
                return 0;
        
        /* get F-Curves to take keyframes from */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
+       filter= ANIMFILTER_DATA_VISIBLE;
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through each F-Curve, working on the keyframes until the first curve aborts */
@@ -491,7 +491,7 @@ void ANIM_editkeyframes_refresh(bAnimContext *ac)
        int filter;
        
        /* filter animation data */
-       filter= ANIMFILTER_CURVESONLY
+       filter= ANIMFILTER_DATA_VISIBLE
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop over F-Curves that are likely to have been edited, and check them */
index be46c237e802ce39fa0fdcf54f5dec348c4a5794..36e52fa8b8fc7397f14833667c0d4b2851fe4929 100644 (file)
@@ -183,26 +183,60 @@ typedef enum eAnim_KeyType {
 
 /* ----------------- Filtering -------------------- */
 
+#if 0 /// old
 /* filtering flags  - under what circumstances should a channel be added */
 typedef enum eAnimFilter_Flags {
        ANIMFILTER_VISIBLE              = (1<<0),       /* should channels be visible (in terms of hierarchy only) */
-       ANIMFILTER_SEL                  = (1<<1),       /* should channels be selected */
-       ANIMFILTER_UNSEL                = (1<<2),       /* should channels be NOT selected */
-       ANIMFILTER_FOREDIT              = (1<<3),       /* does editable status matter */
-       ANIMFILTER_CURVESONLY   = (1<<4),       /* don't include summary-channels, etc. */
+       //ANIMFILTER_SEL                        = (1<<1),       /* should channels be selected */
+       //ANIMFILTER_UNSEL              = (1<<2),       /* should channels be NOT selected */
+       //ANIMFILTER_FOREDIT            = (1<<3),       /* does editable status matter */
+       ANIMFILTER_CURVESONLY   = (1<<4),       /* don't include summary-channels, etc. */ // double-check on how this goes for actedit
        ANIMFILTER_CHANNELS             = (1<<5),       /* make list for interface drawing */
-       ANIMFILTER_ACTGROUPED   = (1<<6),       /* belongs to the active actiongroup */
+       //ANIMFILTER_ACTGROUPED = (1<<6),       /* belongs to the active actiongroup */
        ANIMFILTER_CURVEVISIBLE = (1<<7),       /* F-Curve is visible for editing/viewing in Graph Editor */
-       ANIMFILTER_ACTIVE               = (1<<8),       /* channel should be 'active' */
-       ANIMFILTER_ANIMDATA             = (1<<9),       /* only return the underlying AnimData blocks (not the tracks, etc.) data comes from */
+       //ANIMFILTER_ACTIVE             = (1<<8),       /* channel should be 'active' */
+       //ANIMFILTER_ANIMDATA           = (1<<9),       /* only return the underlying AnimData blocks (not the tracks, etc.) data comes from */
        ANIMFILTER_NLATRACKS    = (1<<10),      /* only include NLA-tracks */
-       ANIMFILTER_SELEDIT              = (1<<11),      /* link editability with selected status */
-       ANIMFILTER_NODUPLIS             = (1<<12),      /* duplicate entries for animation data attached to multi-user blocks must not occur */
-       
-       /* all filters - the power inside the bracket must be the last power for left-shifts + 1 */
-       ANIMFILTER_ALLFILTERS   = ((1<<12) - 1)
+       //ANIMFILTER_SELEDIT            = (1<<11),      /* link editability with selected status */
+       //ANIMFILTER_NODUPLIS           = (1<<12),      /* duplicate entries for animation data attached to multi-user blocks must not occur */
 } eAnimFilter_Flags;
+#endif
 
+/* filtering flags  - under what circumstances should a channel be returned */
+// TODO: flag to just test if there's any channel inside worthy of being added - return 1 as soon as this is encountered, but don't add
+typedef enum eAnimFilter_Flags {
+       /* data which channel represents is fits the dopesheet filters (i.e. scene visibility criteria) */
+       // XXX: it's hard to think of any examples where this *ISN'T* the case... perhaps becomes implicit?
+       ANIMFILTER_DATA_VISIBLE   = (1<<0),
+       /* channel is visible within the channel-list hierarchy (i.e. F-Curves within Groups in ActEdit) */
+       ANIMFILTER_LIST_VISIBLE   = (1<<1),
+       /* channel has specifically been tagged as visible in Graph Editor (* Graph Editor Only) */
+       ANIMFILTER_CURVE_VISIBLE  = (1<<2),
+       
+       /* include summary channels and "expanders" (for drawing/mouse-selection in channel list) */
+       ANIMFILTER_LIST_CHANNELS  = (1<<3),
+       
+       /* for its type, channel should be "active" one */
+       ANIMFILTER_ACTIVE         = (1<<4),
+       /* channel is a child of the active group (* Actions speciality) */
+       ANIMFILTER_ACTGROUPED     = (1<<5),
+       
+       /* channel must be selected/not-selected, but both must not be set together */
+       ANIMFILTER_SEL            = (1<<6),
+       ANIMFILTER_UNSEL          = (1<<7),
+       
+       /* editability status - must be editable to be included */
+       ANIMFILTER_FOREDIT        = (1<<8),
+       /* only selected animchannels should be considerable as editable - mainly for Graph Editor's option for keys on select curves only */
+       ANIMFILTER_SELEDIT        = (1<<9), 
+       
+       /* flags used to enforce certain data types */
+       // NOTE: the ones for curves and NLA tracks were redundant and have been removed for now...
+       ANIMFILTER_ANIMDATA       = (1<<10),
+       
+       /* duplicate entries for animation data attached to multi-user blocks must not occur */
+       ANIMFILTER_NODUPLIS       = (1<<11)
+} eAnimFilter_Flags;
 
 /* ---------- Flag Checking Macros ------------ */
 // xxx check on all of these flags again...
index 760db5dd133dbb23a8dda872428bba7fe1ab0458..9df6ceb9d751ba6936ee3c474f3187769e74591f 100644 (file)
@@ -81,7 +81,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
        int height;
        
        /* build list of channels to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* Update max-extent of channels here (taking into account scrollers):
@@ -196,7 +196,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
        }
        
        /* build list of channels to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* Update max-extent of channels here (taking into account scrollers):
index b30db6680e5082cd79303322a720044c2f3fc9d3..07f448742bd3f631df343bcdccbcd2de3eccf0dd 100644 (file)
@@ -234,7 +234,7 @@ static void get_keyframe_extents (bAnimContext *ac, float *min, float *max, cons
        int filter;
        
        /* get data to filter, from Action or Dopesheet */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* set large values to try to override */
@@ -414,7 +414,7 @@ static short copy_action_keys (bAnimContext *ac)
        free_anim_copybuf();
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* copy keyframes */
@@ -434,7 +434,7 @@ static short paste_action_keys (bAnimContext *ac,
        int filter, ok=0;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* paste keyframes */
@@ -561,7 +561,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
        short flag = 0;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        if (mode == 2)                  filter |= ANIMFILTER_SEL;
        else if (mode == 3)     filter |= ANIMFILTER_ACTGROUPED;
        
@@ -649,9 +649,9 @@ static void duplicate_action_keys (bAnimContext *ac)
        
        /* filter data */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and delete selected keys */
@@ -724,9 +724,9 @@ static void delete_action_keys (bAnimContext *ac)
        
        /* filter data */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and delete selected keys */
@@ -797,7 +797,7 @@ static void clean_action_keys (bAnimContext *ac, float thresh)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and clean curves */
@@ -865,7 +865,7 @@ static void sample_action_keys (bAnimContext *ac)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and add keys between selected keyframes on every frame  */
@@ -935,7 +935,7 @@ static void setexpo_action_keys(bAnimContext *ac, short mode)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting mode per F-Curve */
@@ -1006,7 +1006,7 @@ static void setipo_action_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc set_cb= ANIM_editkeyframes_ipo(mode);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting BezTriple interpolation
@@ -1090,7 +1090,7 @@ static void sethandles_action_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc sel_cb= ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting flags for handles 
@@ -1174,7 +1174,7 @@ static void setkeytype_action_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc set_cb= ANIM_editkeyframes_keytype(mode);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting BezTriple interpolation
@@ -1254,7 +1254,7 @@ static int actkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op))
        
        /* init edit data */    
        /* loop over action data, averaging values */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY */ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -1321,9 +1321,9 @@ static void snap_action_keys(bAnimContext *ac, short mode)
        
        /* filter data */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* get beztriple editing callbacks */
@@ -1440,9 +1440,9 @@ static void mirror_action_keys(bAnimContext *ac, short mode)
        
        /* filter data */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* mirror keyframes */
index 95f618ad36027110157228719405debff65494de..0f84ae547ff3430efdfe34017a0ee575742cbc94 100644 (file)
@@ -95,9 +95,9 @@ static void deselect_action_keys (bAnimContext *ac, short test, short sel)
        
        /* determine type-based settings */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        
        /* filter data */
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -211,7 +211,7 @@ static void borderselect_action (bAnimContext *ac, rcti rect, short mode, short
        UI_view2d_region_to_view(v2d, rect.xmax, rect.ymax-2, &rectf.xmax, &rectf.ymax);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* get filtering flag for dopesheet data (if applicable) */
@@ -388,7 +388,7 @@ static void markers_selectkeys_between (bAnimContext *ac)
        ked.f2= max;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY */ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* select keys in-between */
@@ -431,14 +431,14 @@ static void columnselect_action_keys (bAnimContext *ac, short mode)
        switch (mode) {
                case ACTKEYS_COLUMNSEL_KEYS: /* list of selected keys */
                        if (ac->datatype == ANIMCONT_GPENCIL) {
-                               filter= (ANIMFILTER_VISIBLE);
+                               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE);
                                ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                                
                                for (ale= anim_data.first; ale; ale= ale->next)
                                        gplayer_make_cfra_list(ale->data, &ked.list, 1);
                        }
                        else {
-                               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
+                               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/);
                                ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                                
                                for (ale= anim_data.first; ale; ale= ale->next)
@@ -471,9 +471,9 @@ static void columnselect_action_keys (bAnimContext *ac, short mode)
         * based on the keys found to be selected above
         */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -563,7 +563,7 @@ static int actkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* loop through all of the keys and select additional keyframes based on these */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -617,7 +617,7 @@ static void select_moreless_action_keys (bAnimContext *ac, short mode)
        build_cb= ANIM_editkeyframes_buildselmap(mode);
        
        /* loop through all of the keys and select additional keyframes based on these */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -758,9 +758,9 @@ static void actkeys_select_leftright (bAnimContext *ac, short leftright, short s
        
        /* filter data */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                
        /* select keys */
@@ -941,9 +941,9 @@ static void actkeys_mselect_column(bAnimContext *ac, short select_mode, float se
         * based on the keys found to be selected above
         */
        if (ac->datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY */ | ANIMFILTER_NODUPLIS);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -997,7 +997,7 @@ static void mouse_action_keys (bAnimContext *ac, const int mval[2], short select
        UI_view2d_region_to_view(v2d, mval[0]+7, mval[1], &rectf.xmax, &rectf.ymax);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* try to get channel */
index 73ecea8e31efbd8f28e0bfcc5d3bf794665ae2ec..b5c253fdbff905c653f6587ab00159c93f0b3b31 100644 (file)
@@ -834,7 +834,7 @@ void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGri
        int filter;
        
        /* build list of curves to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CURVESONLY|ANIMFILTER_CURVEVISIBLE);
+       filter= (ANIMFILTER_DATA_VISIBLE|ANIMFILTER_CURVE_VISIBLE);
        filter |= ((sel) ? (ANIMFILTER_SEL) : (ANIMFILTER_UNSEL));
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                
@@ -968,7 +968,7 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
        int i=0;
        
        /* build list of channels to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* Update max-extent of channels here (taking into account scrollers):
index 71c937b87cb9da1baca2bb9fda12bd1aabe61ffa..6ae6ecf88fc508c470378f2e9379ebe76f2605d8 100644 (file)
@@ -88,7 +88,7 @@ void get_graph_keyframe_extents (bAnimContext *ac, float *xmin, float *xmax, flo
        int filter;
        
        /* get data to filter, from Dopesheet */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* set large values to try to override */
@@ -294,7 +294,7 @@ static void create_ghost_curves (bAnimContext *ac, int start, int end)
        }
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and add keys between selected keyframes on every frame  */
@@ -453,7 +453,7 @@ static void insert_graph_keys(bAnimContext *ac, short mode)
        short flag = 0;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        if (mode == 2) filter |= ANIMFILTER_SEL;
        
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -648,7 +648,7 @@ static short copy_graph_keys (bAnimContext *ac)
        free_anim_copybuf();
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* copy keyframes */
@@ -667,7 +667,7 @@ static short paste_graph_keys (bAnimContext *ac,
        int filter, ok=0;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* paste keyframes */
@@ -773,7 +773,7 @@ static void duplicate_graph_keys (bAnimContext *ac)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and delete selected keys */
@@ -842,7 +842,7 @@ static void delete_graph_keys (bAnimContext *ac)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and delete selected keys */
@@ -909,7 +909,7 @@ static void clean_graph_keys (bAnimContext *ac, float thresh)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_SEL | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and clean curves */
@@ -976,7 +976,7 @@ static void bake_graph_curves (bAnimContext *ac, int start, int end)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and add keys between selected keyframes on every frame  */
@@ -1123,7 +1123,7 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
        end = CFRA + sbi.length - 1;
 
        /* filter anim channels */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 
        /* loop through all selected F-Curves, replacing its data with the sound samples */
@@ -1201,7 +1201,7 @@ static void sample_graph_keys (bAnimContext *ac)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE| ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through filtered data and add keys between selected keyframes on every frame  */
@@ -1270,7 +1270,7 @@ static void setexpo_graph_keys(bAnimContext *ac, short mode)
        int filter;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting mode per F-Curve */
@@ -1339,7 +1339,7 @@ static void setipo_graph_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc set_cb= ANIM_editkeyframes_ipo(mode);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting BezTriple interpolation
@@ -1412,7 +1412,7 @@ static void sethandles_graph_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc sel_cb= ANIM_editkeyframes_ok(BEZT_OK_SELECTED);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through setting flags for handles 
@@ -1534,7 +1534,7 @@ static int graphkeys_euler_filter_exec (bContext *C, wmOperator *op)
         */
         
        /* step 1: extract only the rotation f-curves */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -1700,7 +1700,7 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op))
        memset(&ked, 0, sizeof(KeyframeEditData));
        
        /* loop over action data, averaging values */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -1779,7 +1779,7 @@ static void snap_graph_keys(bAnimContext *ac, short mode)
        KeyframeEditFunc edit_cb;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* get beztriple editing callbacks */
@@ -1911,7 +1911,7 @@ static void mirror_graph_keys(bAnimContext *ac, short mode)
        }
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE| ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* mirror keyframes */
@@ -1995,7 +1995,7 @@ static int graphkeys_smooth_exec(bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE| ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* smooth keyframes */
@@ -2086,11 +2086,11 @@ static int graph_fmodifier_add_exec(bContext *C, wmOperator *op)
        type= RNA_enum_get(op->ptr, "type");
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
        if (RNA_boolean_get(op->ptr, "only_active"))
                filter |= ANIMFILTER_ACTIVE; // FIXME: enforce in this case only a single channel to get handled?
        else
-               filter |= (ANIMFILTER_SEL|ANIMFILTER_CURVEVISIBLE);
+               filter |= (ANIMFILTER_SEL|ANIMFILTER_CURVE_VISIBLE);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* add f-modifier to each curve */
@@ -2209,7 +2209,7 @@ static int graph_fmodifier_paste_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* paste modifiers */
index 507ee43c6aaec79d7a9ab49d9fb470ee6c57c5d2..b8c5d79df184563d6d616c4acaae3dc361a60b61 100644 (file)
@@ -95,7 +95,7 @@ static void deselect_graph_keys (bAnimContext *ac, short test, short sel)
        KeyframeEditFunc test_cb, sel_cb;
        
        /* determine type-based settings */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        
        /* filter data */
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -212,7 +212,7 @@ static void borderselect_graphkeys (bAnimContext *ac, rcti rect, short mode, sho
        UI_view2d_region_to_view(v2d, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* get beztriple editing/validation funcs  */
@@ -402,7 +402,7 @@ static void markers_selectkeys_between (bAnimContext *ac)
        ked.f2= max;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* select keys in-between */
@@ -442,7 +442,7 @@ static void columnselect_graph_keys (bAnimContext *ac, short mode)
        /* build list of columns */
        switch (mode) {
                case GRAPHKEYS_COLUMNSEL_KEYS: /* list of selected keys */
-                       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+                       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
                        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                        
                        for (ale= anim_data.first; ale; ale= ale->next)
@@ -474,7 +474,7 @@ static void columnselect_graph_keys (bAnimContext *ac, short mode)
        /* loop through all of the keys and select additional keyframes
         * based on the keys found to be selected above
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -558,7 +558,7 @@ static int graphkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* loop through all of the keys and select additional keyframes based on these */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -613,7 +613,7 @@ static void select_moreless_graph_keys (bAnimContext *ac, short mode)
        memset(&ked, 0, sizeof(KeyframeEditData)); 
        
        /* loop through all of the keys and select additional keyframes based on these */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
@@ -753,7 +753,7 @@ static void graphkeys_select_leftright (bAnimContext *ac, short leftright, short
        }
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
                
        /* select keys */
@@ -965,7 +965,7 @@ static void get_nearest_fcurve_verts_list (bAnimContext *ac, const int mval[2],
         *      - if the option to only show keyframes that belong to selected F-Curves is enabled,
         *        include the 'only selected' flag...
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        if (sipo->flag & SIPO_SELCUVERTSONLY)   // FIXME: this should really be check for by the filtering code...
                filter |= ANIMFILTER_SEL;
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -1200,7 +1200,7 @@ static void mouse_graph_keys (bAnimContext *ac, const int mval[2], short select_
        /* set active F-Curve (NOTE: sync the filter flags with findnearest_fcurve_vert) */
        /* needs to be called with (sipo->flag & SIPO_SELCUVERTSONLY) otherwise the active flag won't be set [#26452] */
        if (nvi->fcu->flag & FCURVE_SELECTED) {
-               int filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+               int filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
                ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, nvi->fcu, ANIMTYPE_FCURVE);
        }
 
@@ -1264,7 +1264,7 @@ static void graphkeys_mselect_column (bAnimContext *ac, const int mval[2], short
        /* loop through all of the keys and select additional keyframes
         * based on the keys found to be selected above
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_CURVESONLY | ANIMFILTER_NODUPLIS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
index e20b4593fa9d528f492a0fdba62a1ed776c7691a..3f2993fd793cbdd362bd4f50a66a8b7719ae9d13 100644 (file)
 /* Find 'active' F-Curve. It must be editable, since that's the purpose of these buttons (subject to change).  
  * We return the 'wrapper' since it contains valuable context info (about hierarchy), which will need to be freed 
  * when the caller is done with it.
+ *
+ * NOTE: curve-visible flag isn't included, otherwise selecting a curve via list to edit is too cumbersome
  */
 bAnimListElem *get_active_fcurve_channel (bAnimContext *ac)
 {
        ListBase anim_data = {NULL, NULL};
-       int filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_ACTIVE | ANIMFILTER_CURVESONLY);
+       int filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_ACTIVE);
        size_t items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* We take the first F-Curve only, since some other ones may have had 'active' flag set
@@ -115,7 +117,7 @@ int graphop_visible_keyframes_poll (bContext *C)
        /* loop over the visible (selection doesn't matter) F-Curves, and see if they're suitable
         * stopping on the first successful match
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE);
        items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        if (items == 0) 
                return 0;
@@ -164,7 +166,7 @@ int graphop_editable_keyframes_poll (bContext *C)
        /* loop over the editable F-Curves, and see if they're suitable
         * stopping on the first successful match
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
        items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        if (items == 0) 
                return 0;
@@ -215,7 +217,7 @@ int graphop_active_fcurve_poll (bContext *C)
                
        /* free temp data... */
        has_fcurve= ((ale->data) && (ale->type == ANIMTYPE_FCURVE));
-       if(has_fcurve) {
+       if (has_fcurve) {
                FCurve *fcu= (FCurve *)ale->data;
                has_fcurve= (fcu->flag & FCURVE_VISIBLE)!=0;
        }
@@ -244,8 +246,10 @@ int graphop_selected_fcurve_poll (bContext *C)
        if (ANIM_animdata_get_context(C, &ac) == 0)
                return 0;
        
-       /* get the editable + selected F-Curves, and as long as we got some, we can return */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+       /* get the editable + selected F-Curves, and as long as we got some, we can return 
+        * NOTE: curve-visible flag isn't included, otherwise selecting a curve via list to edit is too cumbersome
+        */
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT);
        items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        if (items == 0) 
                return 0;
index 24e196749a85d8180316ef8d130cc29ba97a818e..f58963d1d98af08297c20dccb796c35a7c013e4d 100644 (file)
@@ -521,7 +521,7 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
                 *      - we don't include ANIMFILTER_CURVEVISIBLE filter, as that will result in a 
                 *        mismatch between channel-colors and the drawn curves
                 */
-               filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CURVESONLY|ANIMFILTER_NODUPLIS);
+               filter= (ANIMFILTER_DATA_VISIBLE|ANIMFILTER_NODUPLIS);
                items= ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
                
                /* loop over F-Curves, assigning colors */
index 94232699c30bc7159f40d689ea35f41d90fc544a..677e818351decdb7d211e3741eb6fe84e280dc12 100644 (file)
@@ -103,7 +103,8 @@ static int nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA
        /* extract list of active channel(s), of which we should only take the first one 
         *      - we need the channels flag to get the active AnimData block when there are no NLA Tracks
         */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_ACTIVE|ANIMFILTER_CHANNELS);
+       // XXX: double-check active!
+       filter= (ANIMFILTER_DATA_VISIBLE|ANIMFILTER_LIST_VISIBLE|ANIMFILTER_ACTIVE|ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        for (ale= anim_data.first; ale; ale= ale->next) {
index be050dded458189a85f1b1f4b51be8228b01b3c5..c724a7e0ea7ca69b98113dfa4e764ebbcd1aad34 100644 (file)
@@ -87,7 +87,7 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho
        
        /* get the channel that was clicked on */
                /* filter channels */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
                /* get channel from index */
@@ -380,12 +380,12 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the AnimData blocks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_SEL);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* add tracks... */
        for (ale= anim_data.first; ale; ale= ale->next) {
-               if(ale->type == ANIMTYPE_NLATRACK) {
+               if (ale->type == ANIMTYPE_NLATRACK) {
                        NlaTrack *nlt= (NlaTrack *)ale->data;
                        AnimData *adt= ale->adt;
                        
@@ -448,7 +448,7 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the AnimData blocks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_SEL);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* delete tracks */
index c53eac78b197dc67b1aac633599a956896d5fb53..dc9594c6e4c1cb51eb2f060ba724757545a60aae 100644 (file)
@@ -474,7 +474,7 @@ void draw_nla_main_data (bAnimContext *ac, SpaceNla *snla, ARegion *ar)
        int height;
        
        /* build list of channels to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* Update max-extent of channels here (taking into account scrollers):
@@ -833,7 +833,7 @@ void draw_nla_channel_list (bContext *C, bAnimContext *ac, ARegion *ar)
        int height;
        
        /* build list of channels to draw */
-       filter= (ANIMFILTER_VISIBLE|ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items= ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* Update max-extent of channels here (taking into account scrollers):
index 08607e6183b24531afd61da592cc9d46a5b4cadb..2d6ecbc437805538690fecd03d33dcd7259df6df 100644 (file)
@@ -80,7 +80,7 @@ void ED_nla_postop_refresh (bAnimContext *ac)
 {
        ListBase anim_data = {NULL, NULL};
        bAnimListElem *ale;
-       short filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA | ANIMFILTER_FOREDIT);
+       short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA | ANIMFILTER_FOREDIT);
        
        /* get blocks to work on */
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -116,7 +116,7 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the AnimData blocks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* if no blocks, popup error? */
@@ -185,7 +185,7 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the AnimData blocks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* if no blocks, popup error? */
@@ -282,7 +282,7 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op)
        /* get a list of the editable tracks being shown in the NLA
         *      - this is limited to active ones for now, but could be expanded to 
         */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ACTIVE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ACTIVE | ANIMFILTER_FOREDIT);
        items= ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        if (items == 0) {
@@ -380,7 +380,7 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each track, find pairs of strips to add transitions to */
@@ -494,7 +494,7 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each track, find pairs of strips to add transitions to */
@@ -555,7 +555,7 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each track, find pairs of strips to add transitions to */
@@ -611,7 +611,7 @@ static int nlaedit_duplicate_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* duplicate strips in tracks starting from the last one so that we're 
@@ -714,7 +714,7 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, delete all selected strips */
@@ -855,7 +855,7 @@ static int nlaedit_split_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, split all selected strips into two strips */
@@ -931,7 +931,7 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each AnimData block, bake strips to animdata... */
@@ -986,7 +986,7 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* go over all selected strips */
@@ -1045,7 +1045,7 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* consider each track in turn */
@@ -1203,7 +1203,7 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* since we're potentially moving strips from lower tracks to higher tracks, we should
@@ -1277,7 +1277,7 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* loop through the tracks in normal order, since we're pushing strips down,
@@ -1352,7 +1352,7 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        if (active_only) filter |= ANIMFILTER_ACTIVE;
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
@@ -1447,7 +1447,7 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* init the editing data */
@@ -1527,7 +1527,7 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, reset scale of all selected strips */
@@ -1603,7 +1603,7 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* get some necessary vars */
@@ -1771,7 +1771,7 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
                
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, add the specified modifier to all selected strips */
@@ -1852,7 +1852,7 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op)
        free_fmodifiers_copybuf();
        
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, add the specified modifier to all selected strips */
@@ -1911,7 +1911,7 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        
        /* get a list of the editable tracks being shown in the NLA */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_SEL | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* for each NLA-Track, add the specified modifier to all selected strips */
index 8ef63b9a83dadbfa2a8680feb7da4beffd081f0e..5efa3f34c9861ea75cac7b88e3d9c2c44c2447af 100644 (file)
@@ -114,7 +114,8 @@ static void deselect_nla_strips (bAnimContext *ac, short test, short sel)
        short smode;
        
        /* determine type-based settings */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS);
+       // FIXME: double check whether ANIMFILTER_LIST_VISIBLE is needed!
+       filter= (ANIMFILTER_DATA_VISIBLE);
        
        /* filter data */
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
@@ -233,7 +234,7 @@ static void borderselect_nla_strips (bAnimContext *ac, rcti rect, short mode, sh
        UI_view2d_region_to_view(v2d, rect.xmax, rect.ymax-2, &rectf.xmax, &rectf.ymax);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* convert selection modes to selection modes */
@@ -395,7 +396,7 @@ static void nlaedit_select_leftright (bContext *C, bAnimContext *ac, short leftr
        
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* select strips on the side where most data occurs */
@@ -523,7 +524,7 @@ static void mouse_nla_strips (bContext *C, bAnimContext *ac, const int mval[2],
        UI_view2d_region_to_view(v2d, mval[0]+7, mval[1], &xmax, &dummy);
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CHANNELS);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* try to get channel */
index 34d206f9d6b53054d272a13578d34cb6f5cce51e..3f6383bb855659fe0a3b6f37e41341b16af0a198 100644 (file)
@@ -2494,7 +2494,7 @@ static void createTransNlaData(bContext *C, TransInfo *t)
                return;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_NLATRACKS | ANIMFILTER_FOREDIT);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* which side of the current frame should be allowed */
@@ -2834,7 +2834,7 @@ static void posttrans_action_clean (bAnimContext *ac, bAction *act)
        int filter;
 
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
        ANIM_animdata_filter(ac, &anim_data, filter, act, ANIMCONT_ACTION);
 
        /* loop through relevant data, removing keyframes as appropriate
@@ -2842,7 +2842,7 @@ static void posttrans_action_clean (bAnimContext *ac, bAction *act)
         */
        for (ale= anim_data.first; ale; ale= ale->next) {
                AnimData *adt= ANIM_nla_mapping_get(ac, ale);
-
+               
                if (adt) {
                        ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
                        posttrans_fcurve_clean(ale->key_data);
@@ -3036,9 +3036,9 @@ static void createTransActionData(bContext *C, TransInfo *t)
        
        /* filter data */
        if (ac.datatype == ANIMCONT_GPENCIL)
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
        else
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* which side of the current frame should be allowed */
@@ -3263,7 +3263,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
                return;
        
        /* filter data */
-       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_CURVEVISIBLE);
+       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* which side of the current frame should be allowed */
@@ -4777,7 +4777,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                if (ELEM(ac.datatype, ANIMCONT_DOPESHEET, ANIMCONT_SHAPEKEY)) {
                        ListBase anim_data = {NULL, NULL};
                        bAnimListElem *ale;
-                       short filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+                       short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
                        
                        /* get channels to work on */
                        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
@@ -4889,7 +4889,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                {
                        ListBase anim_data = {NULL, NULL};
                        bAnimListElem *ale;
-                       short filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_CURVEVISIBLE);
+                       short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
                        
                        /* get channels to work on */
                        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
@@ -4939,7 +4939,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                {
                        ListBase anim_data = {NULL, NULL};
                        bAnimListElem *ale;
-                       short filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NLATRACKS);
+                       short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
                        
                        /* get channels to work on */
                        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
index 82f3ad87785c8d82c469ce406f7d262f40b60686..b62651da3d11d35e91a09a288381bbd1cd5abedc 100644 (file)
@@ -362,7 +362,7 @@ void recalcData(TransInfo *t)
                }
                else {
                        /* get animdata blocks visible in editor, assuming that these will be the ones where things changed */
-                       filter= (ANIMFILTER_VISIBLE | ANIMFILTER_ANIMDATA);
+                       filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA);
                        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
                        
                        /* just tag these animdata-blocks to recalc, assuming that some data there changed 
@@ -407,7 +407,7 @@ void recalcData(TransInfo *t)
                flushTransGraphData(t);
                
                /* get curves to check if a re-sort is needed */
-               filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY | ANIMFILTER_CURVEVISIBLE);
+               filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
                ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
                
                /* now test if there is a need to re-sort */