sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #23707: Autokey Available is ignored on a Clear Transform

Browse Source 
Checks are now done to see if only the active KeyingSet should be used instead of always using a hardcoded value only.
This commit is contained in:
Joshua Leung 2010-09-07 03:58:50 +00:00
parent 2ffa9e1309
commit 51d996ab36
2 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/armature/editarmature.c
View File

@ -4830,8 +4830,6 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scaling");
short autokey = 0;
/* only clear those channels that are not locked */
@ -4862,6 +4860,17 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op)
/* perform autokeying on the bones if needed */
if (autokey) {
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Scaling");
/* insert keyframes */
ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
@ -4897,8 +4906,6 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
short autokey = 0;
/* only clear those channels that are not locked */
@ -4930,6 +4937,17 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op)
/* perform autokeying on the bones if needed */
if (autokey) {
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Location");
/* insert keyframes */
ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
@ -4965,8 +4983,6 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
short autokey = 0;
/* only clear those channels that are not locked */
@ -5082,6 +5098,17 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op)
/* perform autokeying on the bones if needed */
if (autokey) {
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Rotation");
/* insert keyframes */
ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);

33
source/blender/editors/object/object_transform.c
View File

@ -68,7 +68,16 @@ static int object_location_clear_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Location");
/* clear location of selected objects if not in weight-paint mode */
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
@ -127,7 +136,16 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Rotation");
/* clear rotation of selected objects if not in weight-paint mode */
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
@ -270,7 +288,16 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scaling");
KeyingSet *ks;
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
* or otherwise key transforms only
*/
if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset))
ks = ANIM_scene_get_active_keyingset(scene);
else
ks = ANIM_builtin_keyingset_get_named(NULL, "Scaling");
/* clear scales of selected objects if not in weight-paint mode */
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {