diff options
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 32 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframes_general.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 2 |
5 files changed, 30 insertions, 30 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 7630754db1a..efd057d4e76 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -80,7 +80,7 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, short datatype, int f /* try to build list of filtered items */ ANIM_animdata_filter(ac, &anim_data, filter, data, datatype); - if (anim_data.first == NULL) + if (BLI_listbase_is_empty(&anim_data)) return; /* only clear the 'active' flag for the channels of the same type */ @@ -550,7 +550,7 @@ void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *f /* if group has no more channels, remove it too, * otherwise can have many dangling groups [#33541] */ - if (agrp->channels.first == NULL) { + if (BLI_listbase_is_empty(&agrp->channels)) { BLI_freelinkN(&act->groups, agrp); } } @@ -565,7 +565,7 @@ void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *f * channel list that are empty, and linger around long after the data they * are for has disappeared (and probably won't come back). */ - if ((act->curves.first == NULL) && (adt->flag & ADT_NLA_EDIT_ON) == 0) { + if (BLI_listbase_is_empty(&act->curves) && (adt->flag & ADT_NLA_EDIT_ON) == 0) { id_us_min(&act->id); adt->action = NULL; } @@ -844,7 +844,7 @@ static void rearrange_animchannel_flatten_islands(ListBase *islands, ListBase *s tReorderChannelIsland *island, *isn = NULL; /* make sure srcList is empty now */ - BLI_assert(srcList->first == NULL); + BLI_assert(BLI_listbase_is_empty(srcList)); /* go through merging islands */ for (island = islands->first; island; island = isn) { @@ -866,7 +866,7 @@ static bool rearrange_animchannel_islands(ListBase *list, AnimChanRearrangeFp re short done = FALSE; /* don't waste effort on an empty list */ - if (list->first == NULL) + if (BLI_listbase_is_empty(list)) return 0; /* group channels into islands */ @@ -1221,7 +1221,7 @@ static void animchannels_group_channels(bAnimContext *ac, bAnimListElem *adt_ref /* remove F-Curve from group, then group too if it is now empty */ action_groups_remove_channel(act, fcu); - if ((grp) && (grp->channels.first == NULL)) { + if ((grp) && BLI_listbase_is_empty(&grp->channels)) { BLI_freelinkN(&act->groups, grp); } @@ -1326,7 +1326,7 @@ static int animchannels_ungroup_exec(bContext *C, wmOperator *UNUSED(op)) BLI_addtail(&act->curves, fcu); /* delete group if it is now empty */ - if (agrp->channels.first == NULL) { + if (BLI_listbase_is_empty(&agrp->channels)) { BLI_freelinkN(&act->groups, agrp); } } diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 3744e50db34..9d54d938cc7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1175,7 +1175,7 @@ static size_t animfilter_act_group(bAnimContext *ac, ListBase *anim_data, bDopeS /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -1429,7 +1429,7 @@ static size_t animdata_filter_gpencil(ListBase *anim_data, void *UNUSED(data), i /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } } @@ -1496,7 +1496,7 @@ static size_t animdata_filter_mask(ListBase *anim_data, void *UNUSED(data), int /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } } @@ -1532,7 +1532,7 @@ static size_t animdata_filter_ds_nodetree_group(bAnimContext *ac, ListBase *anim /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -1614,7 +1614,7 @@ static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } } @@ -1659,7 +1659,7 @@ static size_t animdata_filter_ds_texture(bAnimContext *ac, ListBase *anim_data, /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -1757,7 +1757,7 @@ static size_t animdata_filter_ds_material(bAnimContext *ac, ListBase *anim_data, /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -1877,7 +1877,7 @@ static size_t animdata_filter_ds_modifiers(bAnimContext *ac, ListBase *anim_data if (afm.items) { /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &afm.tmp_data); - BLI_assert((afm.tmp_data.first == afm.tmp_data.last) && (afm.tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&afm.tmp_data)); items += afm.items; } @@ -1920,7 +1920,7 @@ static size_t animdata_filter_ds_particles(bAnimContext *ac, ListBase *anim_data /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } } @@ -2068,7 +2068,7 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2102,7 +2102,7 @@ static size_t animdata_filter_ds_keyanim(bAnimContext *ac, ListBase *anim_data, /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2158,7 +2158,7 @@ static size_t animdata_filter_ds_obanim(bAnimContext *ac, ListBase *anim_data, b /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2228,7 +2228,7 @@ static size_t animdata_filter_dopesheet_ob(bAnimContext *ac, ListBase *anim_data /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2270,7 +2270,7 @@ static size_t animdata_filter_ds_world(bAnimContext *ac, ListBase *anim_data, bD /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2324,7 +2324,7 @@ static size_t animdata_filter_ds_scene(bAnimContext *ac, ListBase *anim_data, bD /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } @@ -2381,7 +2381,7 @@ static size_t animdata_filter_dopesheet_scene(bAnimContext *ac, ListBase *anim_d /* now add the list of collected channels */ BLI_movelisttolist(anim_data, &tmp_data); - BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL)); + BLI_assert(BLI_listbase_is_empty(&tmp_data)); items += tmp_items; } diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 0ead68c4d4a..6a359b0e6d0 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -505,7 +505,7 @@ void free_anim_copybuf(void) } /* restore initial state */ - animcopybuf.first = animcopybuf.last = NULL; + BLI_listbase_clear(&animcopybuf); animcopy_firstframe = 999999999.0f; animcopy_lastframe = -999999999.0f; } @@ -774,19 +774,19 @@ short paste_animedit_keys(bAnimContext *ac, ListBase *anim_data, const Scene *scene = (ac->scene); - const short from_single = (animcopybuf.first == animcopybuf.last); - const short to_simple = (anim_data->first == anim_data->last); + const bool from_single = BLI_listbase_is_single(&animcopybuf); + const bool to_simple = BLI_listbase_is_single(anim_data); float offset = 0.0f; int pass; /* check if buffer is empty */ - if (animcopybuf.first == NULL) { + if (BLI_listbase_is_empty(&animcopybuf)) { BKE_report(ac->reports, RPT_ERROR, "No animation data in buffer to paste"); return -1; } - if (anim_data->first == NULL) { + if (BLI_listbase_is_empty(anim_data)) { BKE_report(ac->reports, RPT_ERROR, "No selected F-Curves to paste into"); return -1; } diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index a69403b085f..41f39c1d33a 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -183,7 +183,7 @@ FCurve *verify_fcurve(bAction *act, const char group[], PointerRNA *ptr, fcu = MEM_callocN(sizeof(FCurve), "FCurve"); fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED); - if (act->curves.first == NULL) + if (BLI_listbase_is_empty(&act->curves)) fcu->flag |= FCURVE_ACTIVE; /* first one added active */ /* store path - make copy, and store that */ diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index b0b1ae3b0c9..74bd4960838 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -892,7 +892,7 @@ short ANIM_validate_keyingset(bContext *C, ListBase *dsources, KeyingSet *ks) /* if we don't have any paths now, then this still qualifies as invalid context */ // FIXME: we need some error conditions (to be retrieved from the iterator why this failed!) - if (ks->paths.first == NULL) + if (BLI_listbase_is_empty(&ks->paths)) return MODIFYKEY_INVALID_CONTEXT; } else { |