blender/blender
168
524
Fork 797
Code Issues 6.7k Pull Requests 951 Projects 21 Wiki Activity

Refactor: combine insert_keyframe() and insert_key_rna() into a single function #122053

Merged
Nathan Vegdahl merged 49 commits from nathanvegdahl/blender:combine_keying_functions into main 2024-06-11 16:43:08 +02:00
Conversation 8 Commits 49 Files Changed 9 +12 -12
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c5267a2fb - Show all commits

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

@ -262,7 +262,7 @@ CombinedKeyingResult insert_key_action(Main *bmain,
* \returns How often keyframe insertion was successful and how often it failed / for which reason.
*/
CombinedKeyingResult insert_key_rna(Main *bmain,
PointerRNA *rna_pointer,
ID &id,
const blender::Span<RNAPath> rna_paths,
float scene_frame,
const AnimationEvalContext &anim_eval_context,

16
source/blender/animrig/intern/keyframing.cc
View File

@ -960,7 +960,7 @@ CombinedKeyingResult insert_key_action(Main *bmain,
}
CombinedKeyingResult insert_key_rna(Main *bmain,
PointerRNA *rna_pointer,
ID &id,
const blender::Span<RNAPath> rna_paths,
const float scene_frame,
const AnimationEvalContext &anim_eval_context,
@ -968,22 +968,22 @@ CombinedKeyingResult insert_key_rna(Main *bmain,
const eInsertKeyFlags insert_key_flags)
{
ID *id = rna_pointer->owner_id;
bAction *action = id_action_ensure(bmain, id);
PointerRNA rna_pointer = RNA_id_pointer_create(&id);
bAction *action = id_action_ensure(bmain, &id);
CombinedKeyingResult combined_result;
if (action == nullptr) {
return combined_result;
}
AnimData *adt = BKE_animdata_from_id(id);
AnimData *adt = BKE_animdata_from_id(&id);
/* Keyframing functions can deal with the nla_context being a nullptr. */
ListBase nla_cache = {nullptr, nullptr};
NlaKeyframingContext *nla_context = nullptr;
if (adt && adt->action == action) {
PointerRNA id_pointer = RNA_id_pointer_create(id);
PointerRNA id_pointer = RNA_id_pointer_create(&id);
nla_context = BKE_animsys_get_nla_keyframing_context(
&nla_cache, &id_pointer, adt, &anim_eval_context);
}
@ -995,7 +995,7 @@ CombinedKeyingResult insert_key_rna(Main *bmain,
PointerRNA ptr;
PropertyRNA *prop = nullptr;
const bool path_resolved = RNA_path_resolve_property(
rna_pointer, rna_path.path.c_str(), &ptr, &prop);
&rna_pointer, rna_path.path.c_str(), &ptr, &prop);
if (!path_resolved) {
continue;
}
@ -1005,7 +1005,7 @@ CombinedKeyingResult insert_key_rna(Main *bmain,
BitVector<> successful_remaps(rna_values.size(), false);
BKE_animsys_nla_remap_keyframe_values(nla_context,
rna_pointer,
&rna_pointer,
prop,
rna_values.as_mutable_span(),
rna_path.index.value_or(-1),
@ -1014,7 +1014,7 @@ CombinedKeyingResult insert_key_rna(Main *bmain,
successful_remaps);
const CombinedKeyingResult result = insert_key_action(bmain,
action,
rna_pointer,
&rna_pointer,
prop,
rna_path_id_to_prop->c_str(),
nla_frame,

4
source/blender/animrig/intern/keyframing_auto.cc
View File

@ -144,7 +144,7 @@ void autokeyframe_object(bContext *C, Scene *scene, Object *ob, Span<RNAPath> rn
for (PointerRNA ptr : sources) {
const CombinedKeyingResult result = insert_key_rna(
bmain,
&ptr,
*ptr.owner_id,
rna_paths,
scene_frame,
anim_eval_context,
@ -247,7 +247,7 @@ void autokeyframe_pose_channel(bContext *C,
for (PointerRNA &ptr : sources) {
const CombinedKeyingResult result = insert_key_rna(
bmain,
&ptr,
*ptr.owner_id,
rna_paths,
scene_frame,
anim_eval_context,

2
source/blender/editors/animation/keyframing.cc
View File

@ -403,7 +403,7 @@ static int insert_key(bContext *C, wmOperator *op)
Vector<RNAPath> rna_paths = construct_rna_paths(&id_ptr);
combined_result.merge(animrig::insert_key_rna(bmain,
&id_ptr,
*selected_id,
rna_paths.as_span(),
scene_frame,
anim_eval_context,