Page MenuHome
Differential D2889 Diff 10204 source/blender/editors/animation/anim_filter.c

Changeset View

Standalone View

View Options

source/blender/editors/animation/anim_filter.c

Context not available.
#include "DNA_speaker_types.h" #include "DNA_speaker_types.h"
#include "DNA_world_types.h" #include "DNA_world_types.h"
#include "DNA_gpencil_types.h" #include "DNA_gpencil_types.h"
#include "DNA_brush_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#include "DNA_layer_types.h" #include "DNA_layer_types.h"
Context not available.
ale->datatype = ALE_NONE; ale->datatype = ALE_NONE;
break; break;
} }
case ANIMTYPE_PALETTE:
{
Palette *palette = (Palette *)data;
AnimData *adt = palette->adt;
ale->flag = palette->flag;
ale->key_data = (adt) ? adt->action : NULL;
ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data);
break;
}
} }
} }
Context not available.
*/ */
if (filter_mode & ANIMFILTER_ANIMDATA) { if (filter_mode & ANIMFILTER_ANIMDATA) {
/* just add GPD as a channel - this will add everything needed */ /* just add GPD as a channel - this will add everything needed */
ANIMCHANNEL_NEW_CHANNEL(gpd, ANIMTYPE_GPDATABLOCK, NULL); ANIMCHANNEL_NEW_CHANNEL(gpd, ANIMTYPE_GPDATABLOCK, gpd);
} }
else { else {
ListBase tmp_data = {NULL, NULL}; ListBase tmp_data = {NULL, NULL};
Context not available.
/* Objects in the scene */ /* Objects in the scene */
for (base = view_layer->object_bases.first; base; base = base->next) { for (base = view_layer->object_bases.first; base; base = base->next) {
/* Only consider this object if it has got some GP data (saving on all the other tests) */ /* Only consider this object if it has got some GP data (saving on all the other tests) */
if (base->object && base->object->gpd) { if (base->object && (base->object->type == OB_GPENCIL)) {
Object *ob = base->object; Object *ob = base->object;
/* firstly, check if object can be included, by the following factors: /* firstly, check if object can be included, by the following factors:
Context not available.
/* finally, include this object's grease pencil datablock */ /* finally, include this object's grease pencil datablock */
/* XXX: Should we store these under expanders per item? */ /* XXX: Should we store these under expanders per item? */
items += animdata_filter_gpencil_data(anim_data, ads, ob->gpd, filter_mode); items += animdata_filter_gpencil_data(anim_data, ads, ob->data, filter_mode);
} }
} }
} }
aligorithUnsubmitted
Not Done
Inline Actions

Ack! It would have been best to just leave this one alone.

  1. When we can mix dopesheet data, it would be best to do this slightly differently
  2. In the meantime, we now have like 2 cases for ob->data, but this GP-specific case will end up getting called on normal obdata (e.g. mesh), which may cause issues
aligorith: Ack! It would have been best to just leave this one alone. 1) When we can mix dopesheet data…
Context not available.
} }
/* grease pencil */ /* grease pencil */
if ((ob->gpd) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) { if ((ob->data) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) {
tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, ads, ob->gpd, filter_mode); tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, ads, ob->data, filter_mode);
} }
} }
END_ANIMFILTER_SUBCHANNELS; END_ANIMFILTER_SUBCHANNELS;
Context not available.
if ((gpd) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) { if ((gpd) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) {
tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, ads, gpd, filter_mode); tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, ads, gpd, filter_mode);
} }
/* TODO: one day, when sequencer becomes its own datatype, perhaps it should be included here */ /* TODO: one day, when sequencer becomes its own datatype, perhaps it should be included here */
} }
END_ANIMFILTER_SUBCHANNELS; END_ANIMFILTER_SUBCHANNELS;
Context not available.
return items; return items;
} }
static size_t animdata_filter_ds_palette(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Palette *palette, int filter_mode)
{
ListBase tmp_data = { NULL, NULL };
size_t tmp_items = 0;
size_t items = 0;
/* add world animation channels */
BEGIN_ANIMFILTER_SUBCHANNELS(EXPANDED_PALETTE(palette))
{
/* animation data filtering */
tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID *)palette, filter_mode);
}
END_ANIMFILTER_SUBCHANNELS;
/* did we find anything? */
if (tmp_items) {
/* include data-expand widget first */
if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
/* check if filtering by active status */
if (ANIMCHANNEL_ACTIVEOK(palette)) {
ANIMCHANNEL_NEW_CHANNEL(palette, ANIMTYPE_PALETTE, palette);
}
}
/* now add the list of collected channels */
BLI_movelisttolist(anim_data, &tmp_data);
BLI_assert(BLI_listbase_is_empty(&tmp_data));
items += tmp_items;
}
/* return the number of items added to the list */
return items;
}
/* Helper for animdata_filter_dopesheet() - For checking if an object should be included or not */ /* Helper for animdata_filter_dopesheet() - For checking if an object should be included or not */
static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_mode) static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_mode)
{ {
Context not available.
/* scene-linked animation - e.g. world, compositing nodes, scene anim (including sequencer currently) */ /* scene-linked animation - e.g. world, compositing nodes, scene anim (including sequencer currently) */
items += animdata_filter_dopesheet_scene(ac, anim_data, ads, scene, filter_mode); items += animdata_filter_dopesheet_scene(ac, anim_data, ads, scene, filter_mode);
/* palettes */
for (Palette *palette = G.main->palettes.first; palette; palette = palette->id.next) {
if (palette->adt) {
items += animdata_filter_ds_palette(ac, anim_data, ads, palette, filter_mode);
}
}
/* If filtering for channel drawing, we want the objects in alphabetical order, /* If filtering for channel drawing, we want the objects in alphabetical order,
* to make it easier to predict where items are in the hierarchy * to make it easier to predict where items are in the hierarchy
* - This order only really matters if we need to show all channels in the list (e.g. for drawing) * - This order only really matters if we need to show all channels in the list (e.g. for drawing)
Context not available.
items += animfilter_block_data(ac, anim_data, ads, channel->id, filter_mode); items += animfilter_block_data(ac, anim_data, ads, channel->id, filter_mode);
break; break;
case ANIMTYPE_PALETTE:
items += animdata_filter_ds_palette(ac, anim_data, ads, channel->data, filter_mode);
break;
default: default:
printf("ERROR: Unsupported channel type (%d) in animdata_filter_animchan()\n", channel->type); printf("ERROR: Unsupported channel type (%d) in animdata_filter_animchan()\n", channel->type);
break; break;
Context not available.