Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-23 08:48:13 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-23 08:48:13 +0400
commit6c9362a2ea9afbbe0160624cf6b43e15aa2628fd (patch)
tree5bfe89d875c91c1a3737d613b0b08a1f6e0612eb /source
parent8e2bc6cdbcb47c5f2e4714241fde0ac970f6f58e (diff)
fix for incorrect keying set names 'Scale' vs 'Scaling', where 'Scale' was hard coded in auto keyframe when 'Only Insert Needed' option was enabled and would always fail to return a keying set.
- to be included in 2.60a.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/transform/transform_conversions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 879dc425091..12e65e9d287 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4590,7 +4590,7 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
}
if (doScale) {
- KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scale");
+ KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scaling");
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
}
}
@@ -4705,7 +4705,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
}
if (doScale) {
- KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scale");
+ KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scaling");
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
}
}