diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
commit | 094ab4af034a94402a73c2f661dde600cd3ee334 (patch) | |
tree | ef142e8f0d16ffd384d17fa32dcb2b48877fcb1d /source/blender/editors/transform/transform_conversions.c | |
parent | dc907ef876b128c9767394d00dfc719d55ba077e (diff) | |
parent | 4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff) |
Merge fixes from trunk into 2.60a tag:v2.60a
svn merge ^/trunk/blender \
-c41113 \
-c41117 \
-c41128 \
-c41132 \
-c41134 \
-c41151 \
-c41152 \
-c41175 \
-c41197 \
-c41203 \
-c41211 \
-c41214 \
-c41219
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index c4295b15858..12e65e9d287 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2947,7 +2947,7 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC TransData2D *td2d = *td2dv; int i; - if (fcu == NULL) + if (ELEM(NULL, fcu, fcu->bezt)) return td; for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) { @@ -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); } } |