blender/blender
168
525
Fork 797
Code Issues 6.7k Pull Requests 949 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 +34 -17
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ea6bbb60ca - Show all commits

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

@ -742,6 +742,26 @@ int clear_keyframe(Main *bmain,
return key_count;
}
static std::optional<StringRefNull> default_channel_group(const PointerRNA *ptr,
const StringRef rna_path)
{
if (ptr->type == &RNA_PoseBone) {
bPoseChannel *pose_channel = static_cast<bPoseChannel *>(ptr->data);
return pose_channel->name;
}
else if (ptr->type == &RNA_Object) {
if (rna_path == "location" || rna_path == "scale" || rna_path == "rotation_euler" ||
rna_path == "rotation_quaternion" || rna_path == "rotation_axis_angle" ||
rna_path == "rotation_mode")
{
return "Object Transforms";
}
}
return std::nullopt;
}
CombinedKeyingResult insert_key_action(Main *bmain,
bAction *action,
PointerRNA *ptr,
@ -757,16 +777,12 @@ CombinedKeyingResult insert_key_action(Main *bmain,
BLI_assert(bmain != nullptr);
BLI_assert(action != nullptr);
std::string group;
std::optional<StringRefNull> group;
if (channel_group.has_value()) {
group = *channel_group;
}
else if (ptr->type == &RNA_PoseBone) {
bPoseChannel *pose_channel = static_cast<bPoseChannel *>(ptr->data);
group = pose_channel->name;
}
else {
group = "Object Transforms";
group = default_channel_group(ptr, rna_path);
}
int property_array_index = 0;
@ -777,17 +793,18 @@ CombinedKeyingResult insert_key_action(Main *bmain,
property_array_index++;
continue;
}
const SingleKeyingResult keying_result = insert_keyframe_fcurve_value(bmain,
ptr,
prop,
action,
group.c_str(),
rna_path.c_str(),
property_array_index,
frame,
value,
key_type,
insert_key_flag);
const SingleKeyingResult keying_result = insert_keyframe_fcurve_value(
bmain,
ptr,
prop,
action,
group.has_value() ? group->c_str() : nullptr,
rna_path.c_str(),
property_array_index,
frame,
value,
key_type,
insert_key_flag);
combined_result.add(keying_result);
property_array_index++;
}