diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:13:06 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:13:06 +0300 |
| commit | 1f625cbfeab5126d19bbba1f137dce3cc2b66173 (patch) | |
| tree | 3bc19338552bdeee0b1cc1b9c687e3c00593c420 /source | |
| parent | 792eab8190f538d15ea2086a641383e2c3b3d03e (diff) | |
| parent | e5bb234f6433af9c28b2aec0a4b07c7598a4943f (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index e6df276c44e..cea1a1cf40f 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -840,18 +840,18 @@ typedef enum eKS_Settings { /* Flags for use by keyframe creation/deletion calls */ typedef enum eInsertKeyFlags { - INSERTKEY_NOFLAGS = 0, + INSERTKEY_NOFLAGS = 0, INSERTKEY_NEEDED = (1<<0), /* only insert keyframes where they're needed */ INSERTKEY_MATRIX = (1<<1), /* insert 'visual' keyframes where possible/needed */ INSERTKEY_FAST = (1<<2), /* don't recalculate handles,etc. after adding key */ INSERTKEY_FASTR = (1<<3), /* don't realloc mem (or increase count, as array has already been set out) */ INSERTKEY_REPLACE = (1<<4), /* only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */ INSERTKEY_XYZ2RGB = (1<<5), /* transform F-Curves should have XYZ->RGB color mode */ - INSERTKEY_NO_USERPREF = (1 << 6), /* ignore user-prefs (needed for predictable API use) */ + INSERTKEY_NO_USERPREF = (1<<6), /* ignore user-prefs (needed for predictable API use) */ /* Allow to make a full copy of new key into existing one, if any, instead of 'reusing' existing handles. * Used by copy/paste code. */ INSERTKEY_OVERWRITE_FULL = (1<<7), - INSERTKEY_DRIVER = (1<<8), /* for driver FCurves, use driver's "input" value - for easier corrective driver setup */ + INSERTKEY_DRIVER = (1<<8), /* for driver FCurves, use driver's "input" value - for easier corrective driver setup */ } eInsertKeyFlags; /* ************************************************ */ |