diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-06-09 22:17:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-09 22:17:33 +0300 |
commit | a15180669891dcb4f0a4dff891e8a129b3788776 (patch) | |
tree | 3907a8c7a4dc3afc3289e57dba93e0fbf9514fd9 /source/blender/editors/animation | |
parent | 10d57f991b06ae7c0a0b5e492eec8c7163debf80 (diff) | |
parent | d733826708f9b562687b78424e5c0835cba8c3c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 172f2b9069e..66b3a63c669 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -2035,7 +2035,7 @@ bool autokeyframe_cfra_can_key(Scene *scene, ID *id) else { /* Normal Mode (or treat as being normal mode): * - * Just in case the flags are't set properly (i.e. only on/off is set, without a mode) + * Just in case the flags aren't set properly (i.e. only on/off is set, without a mode) * let's set the "normal" flag too, so that it will all be sane everywhere... */ scene->toolsettings->autokey_mode = AUTOKEY_MODE_NORMAL; |