diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:05:22 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:05:22 +0300 |
| commit | 792eab8190f538d15ea2086a641383e2c3b3d03e (patch) | |
| tree | c0b480a27a61ae2a4c4fefc8351a433526364a88 /source/blender/makesdna | |
| parent | 50579da91a380bac1ca0fa67df62520ee7b47aa5 (diff) | |
| parent | ff839fb6c1c4b45786f9bbcb302d0af4d03c004a (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 099d5da7c49..e6df276c44e 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -840,6 +840,7 @@ typedef enum eKS_Settings { /* Flags for use by keyframe creation/deletion calls */ typedef enum eInsertKeyFlags { + 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 */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 48fe82b3e1a..fd0170b9766 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -116,7 +116,7 @@ typedef struct BezTriple { char h1, h2; /* h1, h2: the handle type of the two handles */ char f1, f2, f3; /* f1, f2, f3: used for selection status */ - char hide; /* hide: used to indicate whether BezTriple is hidden (3D), type of keyframe (eBezTriple_KeyframeTypes) */ + char hide; /* hide: used to indicate whether BezTriple is hidden (3D), type of keyframe (eBezTriple_KeyframeType) */ char easing; /* easing: easing type for interpolation mode (eBezTriple_Easing) */ float back; /* BEZT_IPO_BACK */ |