diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-09-30 15:27:47 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-09-30 15:27:47 +0400 |
| commit | 8a5c516864da4081222c190381c2e54b6073c69c (patch) | |
| tree | d14128aec5e49392cd9fef5b83fdd38def9338ca /source/blender/editors/object/object_transform.c | |
| parent | 81b6d308a771405ef326b1e4cebbc3359e830a6c (diff) | |
Bugfix #23707: Autokey Available is ignored on a Clear Transform
Second attempt at fixing. Last time, I missed the case where the "Only Insert Available" userpref was enabled, which was why the bugreport was reopened. Hopefully I haven't missed anything else...
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 6 |
1 files changed, 6 insertions, 0 deletions
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"); |