Page MenuHome
Differential D2889 Diff 10804 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.
*/ */
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);
} }
} }
} }
Context not available.
} }
/* grease pencil */ /* grease pencil */
if ((ob->gpd) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) { if ((ob->data) && !(ads->filterflag & ADS_FILTER_NOGPENCIL)) {
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…
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.