diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
| commit | 37f47ef3862a85d4d95fe5b18ab3d6b9c88ccdd3 (patch) | |
| tree | a648a61fbbc313c2833a5e4eb3c8d8d75da3c090 /source/blender/makesdna/DNA_anim_types.h | |
| parent | 33267f58581ea8f9d89028958c6e64a8d048d4db (diff) | |
| parent | a117731aa23c25d699c405325c7bb7ac5680a5e7 (diff) | |
NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)
There were a few conflicts/missing files. Hopefully everything updated ok...
Diffstat (limited to 'source/blender/makesdna/DNA_anim_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index fe535b671f8..ffc1561e7ab 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -321,8 +321,10 @@ enum { /* skip evaluation, as RNA-path cannot be resolved (similar to muting, but cannot be set by user) */ FCURVE_DISABLED = (1<<10), - /* curve can only have whole-number values (int or boolean types) */ + /* curve can only have whole-number values (integer types) */ FCURVE_INT_VALUES = (1<<11), + /* curve can only have certain discrete-number values (no interpolation at all, for enums/booleans) */ + FCURVE_DISCRETE_VALUES = (1<<12), } eFCurve_Flags; /* extrapolation modes (only simple value 'extending') */ |