griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Anim, protect back compat API with #ifdef WITH_ANIM_BAKLAVA

Browse Source 
Protect the backward-compatible API implementation with
`#ifdef WITH_ANIM_BAKLAVA` directives.

This also moves the `use_backward_compatible_api()` function further up
in the file, to the place where I'll need it when building the backward-
compatible API implementation for Action groups.

The backward-compatible API implementation makes the legacy Action API also
work on new layered Actions, exposing the data for the first slot.

Pull Request: https://projects.blender.org/blender/blender/pulls/127241
This commit is contained in:
Sybren A. Stüvel
2024-09-06 12:48:17 +02:00
parent ec5ebc8363
commit c7b7bc98ed
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/makesrna/intern/rna_action.cc
View File

@@ -815,6 +815,18 @@ static PointerRNA rna_ActionGroup_channels_get(CollectionPropertyIterator *iter)
return rna_pointer_inherit_refine(&iter->parent, &RNA_FCurve, fcurve);
}
# ifdef WITH_ANIM_BAKLAVA
/* Use the backward-compatible API only when the experimental feature is
* enabled OR if the Action is already a layered Action. */
static bool use_backward_compatible_api(animrig::Action &action)
{
/* action.is_action_layered() returns 'true' on empty Actions, and that case must be protected by
* the experimental flag, hence the expression below uses !action.is_action_legacy(). */
return (USER_EXPERIMENTAL_TEST(&U, use_animation_baklava) && action.is_empty()) ||
!action.is_action_legacy();
}
# endif /* WITH_ANIM_BAKLAVA */
static bActionGroup *rna_Action_groups_new(bAction *act, ReportList *reports, const char name[])
{
if (!act->wrap().is_action_legacy()) {
@@ -862,16 +874,6 @@ static void rna_Action_groups_remove(bAction *act, ReportList *reports, PointerR
WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
}
/* Use the backward-compatible API only when the experimental feature is
* enabled OR if the Action is already a layered Action. */
static bool use_backward_compatible_api(animrig::Action &action)
{
/* action.is_action_layered() returns 'true' on empty Actions, but that case must be protected by
* the experimental flag, hence the expression below uses !action.is_action_legacy(). */
return (USER_EXPERIMENTAL_TEST(&U, use_animation_baklava) && action.is_empty()) ||
!action.is_action_legacy();
}
# ifdef WITH_ANIM_BAKLAVA
static void rna_iterator_Action_fcurves_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
@@ -1006,6 +1008,7 @@ static FCurve *rna_Action_fcurve_find(bAction *act,
return nullptr;
}
# ifdef WITH_ANIM_BAKLAVA
animrig::Action &action = act->wrap();
if (use_backward_compatible_api(action)) {
animrig::ChannelBag *channelbag = animrig::legacy::channelbag_get(action);
@@ -1014,6 +1017,7 @@ static FCurve *rna_Action_fcurve_find(bAction *act,
}
return channelbag->fcurve_find({data_path, index});
}
# endif
/* Returns nullptr if not found. */
return BKE_fcurve_find(&act->curves, data_path, index);
@@ -1023,6 +1027,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerR
{
FCurve *fcu = static_cast<FCurve *>(fcu_ptr->data);
# ifdef WITH_ANIM_BAKLAVA
animrig::Action &action = act->wrap();
if (use_backward_compatible_api(action)) {
animrig::ChannelBag *channelbag = animrig::legacy::channelbag_get(action);
@@ -1041,6 +1046,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerR
return;
}
# endif
if (fcu->grp) {
if (BLI_findindex(&act->groups, fcu->grp) == -1) {
@@ -1073,6 +1079,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerR
static void rna_Action_fcurve_clear(bAction *act)
{
# ifdef WITH_ANIM_BAKLAVA
animrig::Action &action = act->wrap();
if (use_backward_compatible_api(action)) {
animrig::ChannelBag *channelbag = animrig::legacy::channelbag_get(action);
@@ -1085,6 +1092,9 @@ static void rna_Action_fcurve_clear(bAction *act)
else {
BKE_action_fcurves_clear(act);
}
# else
BKE_action_fcurves_clear(act);
# endif
WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
}