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

Refactor: remove argument from ANIM_builtin_keyingset_get_named

Browse Source 
No functional changes

`ANIM_builtin_keyingset_get_named` had a `KeyingSet *` argument
that was always passed as `nullptr`
This patch removes it to simplify the code.

Pull Request: https://projects.blender.org/blender/blender/pulls/113677
This commit is contained in:
Christoph Lendenfeld
2023-10-13 15:40:42 +02:00
committed by Christoph Lendenfeld
parent b753ef73a0
commit 4050b0d6df
5 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,21 +186,21 @@ void autokeyframe_object(
/* insert keyframes for the affected sets of channels using the builtin KeyingSets found */
if (do_loc) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_LOCATION_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_LOCATION_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
if (do_rot) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_ROTATION_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_ROTATION_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
if (do_scale) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_SCALING_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_SCALING_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
}
/* insert keyframe in all (transform) channels */
else {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_LOC_ROT_SCALE_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_LOC_ROT_SCALE_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
}

18
source/blender/editors/animation/keyingsets.cc
View File

@@ -528,25 +528,15 @@ KeyingSetInfo *ANIM_keyingset_info_find_name(const char name[])
BLI_findstring(&keyingset_type_infos, name, offsetof(KeyingSetInfo, idname)));
}
KeyingSet *ANIM_builtin_keyingset_get_named(KeyingSet *prevKS, const char name[])
KeyingSet *ANIM_builtin_keyingset_get_named(const char name[])
{
KeyingSet *ks, *first = nullptr;
/* sanity checks any name to check? */
if (name[0] == 0) {
return nullptr;
}
/* get first KeyingSet to use */
if (prevKS && prevKS->next) {
first = prevKS->next;
}
else {
first = static_cast<KeyingSet *>(builtin_keyingsets.first);
}
/* loop over KeyingSets checking names */
for (ks = first; ks; ks = ks->next) {
LISTBASE_FOREACH (KeyingSet *, ks, &builtin_keyingsets) {
if (STREQ(name, ks->idname)) {
return ks;
}
@@ -710,10 +700,10 @@ KeyingSet *ANIM_get_keyingset_for_autokeying(const Scene *scene, const char *tra
}
if (blender::animrig::is_autokey_flag(scene, AUTOKEY_FLAG_INSERTAVAIL)) {
return ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_AVAILABLE_ID);
return ANIM_builtin_keyingset_get_named(ANIM_KS_AVAILABLE_ID);
}
return ANIM_builtin_keyingset_get_named(nullptr, transformKSName);
return ANIM_builtin_keyingset_get_named(transformKSName);
}
static void anim_keyingset_visit_for_search_impl(const bContext *C,

2
source/blender/editors/armature/pose_edit.cc
View File

@@ -809,7 +809,7 @@ void POSE_OT_reveal(wmOperatorType *ot)
static int pose_flip_quats_exec(bContext *C, wmOperator * /*op*/)
{
Scene *scene = CTX_data_scene(C);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_LOC_ROT_SCALE_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_LOC_ROT_SCALE_ID);
bool changed_multi = false;

5
source/blender/editors/include/ED_keyframing.hh
View File

@@ -239,10 +239,9 @@ int ANIM_apply_keyingset(
/**
* Find builtin #KeyingSet by name.
*
* \return The first builtin #KeyingSet with the given name, which occurs after the given one
* (or start of list if none given).
* \return The first builtin #KeyingSet with the given name
*/
KeyingSet *ANIM_builtin_keyingset_get_named(KeyingSet *prevKS, const char name[]);
KeyingSet *ANIM_builtin_keyingset_get_named(const char name[]);
/**
* Find KeyingSet type info given a name.

8
source/blender/editors/transform/transform_convert_armature.cc
View File

@@ -196,21 +196,21 @@ static void autokeyframe_pose(
}
if (do_loc) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_LOCATION_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_LOCATION_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
if (do_rot) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_ROTATION_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_ROTATION_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
if (do_scale) {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_SCALING_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_SCALING_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
}
/* insert keyframe in all (transform) channels */
else {
KeyingSet *ks = ANIM_builtin_keyingset_get_named(nullptr, ANIM_KS_LOC_ROT_SCALE_ID);
KeyingSet *ks = ANIM_builtin_keyingset_get_named(ANIM_KS_LOC_ROT_SCALE_ID);
ANIM_apply_keyingset(C, &sources, ks, MODIFYKEY_MODE_INSERT, anim_eval_context.eval_time);
}
}