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

Fix #138869: Select Colums on selected Keys fails in NLA tweakmode

Browse Source 
Currently, `columnselect_action_keys` gets "raw" non-NLA-mapped keyframe
data via `ANIM_fcurve_keyframes_loop`  with the `bezt_to_cfraelem` callback,
so the list of `CfraElem` contains frames in "local" FCurve space.

Later, this would be (rightfully) NLA-unmapped to "local/strip" time, because
this is what `ANIM_editkeyframes_ok(BEZT_OK_FRAME)` expects, it also only
compares "raw" `BezTriple` data.

But this only makes sense if we would store "global/scene" frame data in
`CfraElem` `cfra` already.

This is what we now do, let `bezt_to_cfraelem` perform the NLATIME_CONVERT_MAP

Pull Request: https://projects.blender.org/blender/blender/pulls/138937
This commit is contained in:
Philipp Oeser
2025-05-16 17:21:42 +02:00
committed by Philipp Oeser
parent 52b8eba9eb
commit d2ea328a6c
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/animation/keyframes_edit.cc
View File

@@ -844,10 +844,19 @@ short bezt_calc_average(KeyframeEditData *ked, BezTriple *bezt)
short bezt_to_cfraelem(KeyframeEditData *ked, BezTriple *bezt)
{
/* only if selected */
if (bezt->f2 & SELECT) {
CfraElem *ce = MEM_callocN<CfraElem>("cfraElem");
BLI_addtail(&ked->list, ce);
if ((bezt->f2 & SELECT) == 0) {
return 0;
}
CfraElem *ce = MEM_callocN<CfraElem>("cfraElem");
BLI_addtail(&ked->list, ce);
/* bAnimListElem so we can do NLA mapping, we want the cfra to be in "global" time */
bAnimListElem *ale = static_cast<bAnimListElem *>(ked->data);
if (ale != nullptr) {
ce->cfra = ANIM_nla_tweakedit_remap(ale, bezt->vec[1][0], NLATIME_CONVERT_MAP);
}
else {
ce->cfra = bezt->vec[1][0];
}

1
source/blender/editors/include/ED_keyframes_edit.hh
View File

@@ -166,6 +166,7 @@ ENUM_OPERATORS(eKeyframeIterFlags, KEYFRAME_ITER_HANDLES_DEFAULT_INVISIBLE)
*/
struct CfraElem {
CfraElem *next, *prev;
/* Expected to be in global scene time (e.g. not NLA unmapped). */
float cfra;
int sel;
};

1
source/blender/editors/space_action/action_select.cc
View File

@@ -1165,6 +1165,7 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
ED_gpencil_layer_make_cfra_list(static_cast<bGPDlayer *>(ale->data), &ked.list, true);
}
else {
ked.data = ale;
ANIM_fcurve_keyframes_loop(
&ked, static_cast<FCurve *>(ale->key_data), nullptr, bezt_to_cfraelem, nullptr);
}

1
source/blender/editors/space_graph/graph_select.cc
View File

@@ -1219,6 +1219,7 @@ static void columnselect_graph_keys(bAnimContext *ac, short mode)
ac, &anim_data, eAnimFilter_Flags(filter), ac->data, eAnimCont_Types(ac->datatype));
LISTBASE_FOREACH (bAnimListElem *, ale, &anim_data) {
ked.data = ale;
ANIM_fcurve_keyframes_loop(
&ked, static_cast<FCurve *>(ale->key_data), nullptr, bezt_to_cfraelem, nullptr);
}