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

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-06-18 15:19:16 +10:00
parent 8286355767 67b0e05a62
commit a2865bb370
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/animrig/ANIM_animdata.hh
View File

@@ -33,6 +33,8 @@ bAction *id_action_ensure(Main *bmain, ID *id);
/**
* Delete the F-Curve from the given AnimData block (if possible),
* as appropriate according to animation context.
*
* \note This function cannot be used to delete F-Curves from an NLA strip's Action.
*/
void animdata_fcurve_delete(AnimData *adt, FCurve *fcu);

17
source/blender/editors/animation/anim_channels_edit.cc
View File

@@ -2942,7 +2942,22 @@ static wmOperatorStatus animchannels_delete_exec(bContext *C, wmOperator * /*op*
/* try to free F-Curve */
BLI_assert_msg((fcu->driver != nullptr) == (ac.datatype == ANIMCONT_DRIVERS),
"Expecting only driver F-Curves in the drivers editor");
blender::animrig::animdata_fcurve_delete(adt, fcu);
if (ale->fcurve_owner_id && GS(ale->fcurve_owner_id->name) == ID_AC) {
/* F-Curves can be owned by Actions assigned to NLA strips, which
* `animrig::animdata_fcurve_delete()` (below) cannot handle. */
BLI_assert_msg(!fcu->driver, "Drivers are not expected to be owned by Actions");
blender::animrig::Action &action =
reinterpret_cast<bAction *>(ale->fcurve_owner_id)->wrap();
BLI_assert(!action.is_action_legacy());
action_fcurve_remove(action, *fcu);
}
else if (fcu->driver || adt->action) {
/* This function only works for drivers & directly-assigned Actions: */
blender::animrig::animdata_fcurve_delete(adt, fcu);
}
else {
BLI_assert_unreachable();
}
tag_update_animation_element(ale);
break;
}