diff options
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 6 | ||||
-rw-r--r-- | source/blender/editors/armature/poselib.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_transform.c | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 930f6e684fc..f5396b7b173 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4956,6 +4956,8 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Scaling"); @@ -5033,6 +5035,8 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Location"); @@ -5194,6 +5198,8 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Rotation"); diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index f490158424c..5ead0d42cd2 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -784,6 +784,8 @@ static void poselib_keytag_pose (bContext *C, Scene *scene, tPoseLib_PreviewData if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "LocRotScale"); diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index b8c945f0d77..e2cf5876b51 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -1020,6 +1020,8 @@ static int pose_paste_exec (bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "LocRotScale"); diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 5214676331c..aa19ae2a9e2 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -76,6 +76,8 @@ static int object_location_clear_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Location"); @@ -144,6 +146,8 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Rotation"); @@ -296,6 +300,8 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op) */ if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) ks = ANIM_scene_get_active_keyingset(scene); + else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + ks = ANIM_builtin_keyingset_get_named(NULL, "Available"); else ks = ANIM_builtin_keyingset_get_named(NULL, "Scaling"); |