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/include/ED_anim_api.h | |
parent | 10d57f991b06ae7c0a0b5e492eec8c7163debf80 (diff) | |
parent | d733826708f9b562687b78424e5c0835cba8c3c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
-rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 05ac39b9879..eacf769270b 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -606,7 +606,7 @@ typedef enum eAnimUnitConv_Flags { ANIM_UNITCONV_SKIPKNOTS = (1 << 4), /* Scale FCurve i a way it fits to -1..1 space */ ANIM_UNITCONV_NORMALIZE = (1 << 5), - /* Only whennormalization is used: use scale factor from previous run, + /* Only when normalization is used: use scale factor from previous run, * prevents curves from jumping all over the place when tweaking them. */ ANIM_UNITCONV_NORMALIZE_FREEZE = (1 << 6), |