diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/editors/animation/keyingsets.c | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/editors/animation/keyingsets.c')
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index b5a998f60da..d159636756a 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -710,7 +710,7 @@ int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks) } /* Get Keying Set to use for Auto-Keyframing some transforms */ -KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformKSName) +KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *transformKSName) { /* get KeyingSet to use * - use the active KeyingSet if defined (and user wants to use it for all autokeying), @@ -721,7 +721,7 @@ KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformK else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)) return ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_AVAILABLE_ID); else - return ANIM_builtin_keyingset_get_named(NULL, tranformKSName); + return ANIM_builtin_keyingset_get_named(NULL, transformKSName); } /* Menu of All Keying Sets ----------------------------- */ |