91984fad1b
This wasn't working because the code that stores the backup up the current pose looped over the pose asset's fcurve listbase to determine which bones needed to be backed up. When the pose asset was stored as a slotted action, that listbase was always empty, so nothing was backed up. This resulted in exploding poses as the pose was repeatedly applied on top of itself, and in debug builds would trigger asserts in code that was sanity-checking quaternion values. This PR updates that code to loop over the fcurves of the first slot when the pose asset is stored as a slotted action, which in turn makes pose blending work as expected with slotted actions. Pull Request: https://projects.blender.org/blender/blender/pulls/128686
50 lines
1.5 KiB
C++
50 lines
1.5 KiB
C++
/* SPDX-FileCopyrightText: 2001-2002 NaN Holding BV. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
*/
|
|
|
|
#include "BKE_action.hh"
|
|
|
|
#include "BLI_listbase.h"
|
|
#include "BLI_string.h"
|
|
|
|
#include "DNA_action_types.h"
|
|
#include "DNA_anim_types.h"
|
|
#include "DNA_armature_types.h"
|
|
|
|
#include "ANIM_action_legacy.hh"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
namespace blender::bke {
|
|
|
|
void BKE_action_find_fcurves_with_bones(bAction *action, FoundFCurveCallback callback)
|
|
{
|
|
auto const_callback = [&](const FCurve *fcurve, const char *bone_name) {
|
|
callback(const_cast<FCurve *>(fcurve), bone_name);
|
|
};
|
|
BKE_action_find_fcurves_with_bones(const_cast<const bAction *>(action), const_callback);
|
|
}
|
|
|
|
void BKE_action_find_fcurves_with_bones(const bAction *action, FoundFCurveCallbackConst callback)
|
|
{
|
|
/* As of writing this comment, this is only ever used in the pose library
|
|
* code, where actions are only supposed to have one slot. If either it
|
|
* starts getting used elsewhere or the pose library starts using multiple
|
|
* slots, this will need to be updated. */
|
|
const animrig::slot_handle_t slot_handle = animrig::first_slot_handle(*action);
|
|
|
|
for (const FCurve *fcu : animrig::legacy::fcurves_for_action_slot(action, slot_handle)) {
|
|
char bone_name[MAXBONENAME];
|
|
if (!BLI_str_quoted_substr(fcu->rna_path, "pose.bones[", bone_name, sizeof(bone_name))) {
|
|
continue;
|
|
}
|
|
callback(fcu, bone_name);
|
|
}
|
|
}
|
|
|
|
} // namespace blender::bke
|