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

Anim: add group name support to back-compat Action.fcurves.new()

Browse Source 
Add group name support to the backward-compatible implementation of
`Action.fcurves.new()`. This ensures that the legacy Action API creates
a new-style channel group in the appropriate channel bag.

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

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

@@ -949,11 +949,17 @@ static FCurve *rna_Action_fcurve_new(bAction *act,
return nullptr;
}
animrig::FCurveDescriptor fcurve_descriptor = {data_path, index};
if (group && group[0] != '\0') {
fcurve_descriptor.channel_group = group;
}
# ifdef WITH_ANIM_BAKLAVA
animrig::Action &action = act->wrap();
if (use_backward_compatible_api(action)) {
/* Add the F-Curve to the channelbag for the first slot. */
animrig::ChannelBag &channelbag = animrig::legacy::channelbag_ensure(action);
FCurve *fcurve = channelbag.fcurve_create_unique(bmain, {data_path, index});
FCurve *fcurve = channelbag.fcurve_create_unique(bmain, fcurve_descriptor);
if (!fcurve) {
/* The only reason fcurve_create_unique() returns nullptr is when the curve
* already exists. */
@@ -968,16 +974,12 @@ static FCurve *rna_Action_fcurve_new(bAction *act,
return nullptr;
}
/* TODO: handle the groups. */
return fcurve;
}
if (group && group[0] == '\0') {
group = nullptr;
}
# endif
/* Annoying, check if this exists. */
if (blender::animrig::action_fcurve_find(act, {data_path, index})) {
if (blender::animrig::action_fcurve_find(act, fcurve_descriptor)) {
BKE_reportf(reports,
RPT_ERROR,
"F-Curve '%s[%d]' already exists in action '%s'",
@@ -986,7 +988,12 @@ static FCurve *rna_Action_fcurve_new(bAction *act,
act->id.name + 2);
return nullptr;
}
return blender::animrig::action_fcurve_ensure(bmain, act, group, nullptr, {data_path, index});
return blender::animrig::action_fcurve_ensure(
bmain,
act,
fcurve_descriptor.channel_group ? fcurve_descriptor.channel_group->c_str() : nullptr,
nullptr,
fcurve_descriptor);
}
static FCurve *rna_Action_fcurve_find(bAction *act,