svn merge ^/trunk/blender -r41200:41226 .
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 50cc825fb6880870296eb1c6ed2b253b094ec6eb..fb7d3a4d4b356ffdad65dfea8ce0e27e187e984a 100644 (file)
@@ -4718,21 +4718,21 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
                        
                        /* insert keyframes for the affected sets of channels using the builtin KeyingSets found */
                        if (doLoc) {
-                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                        }
                        if (doRot) {
-                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
                                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, ANIM_KS_SCALING_ID);
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                        }
                }
                /* insert keyframe in all (transform) channels */
                else {
-                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                }
                
@@ -4833,21 +4833,21 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
                                        }
                                        
                                        if (doLoc) {
-                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
                                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                        if (doRot) {
-                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
                                                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, ANIM_KS_SCALING_ID);
                                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                }
                                /* insert keyframe in all (transform) channels */
                                else {
-                                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+                                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
                                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                }