diff options
Diffstat (limited to 'source/blender/makesdna/DNA_curve_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 2ae9ba13177..2f362034b78 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -31,6 +31,7 @@ #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ struct AnimData; +struct CurveProfile; struct EditFont; struct GHash; struct Ipo; @@ -113,9 +114,9 @@ typedef struct BezTriple { char ipo; /** H1, h2: the handle type of the two handles. */ - char h1, h2; + uint8_t h1, h2; /** F1, f2, f3: used for selection status. */ - char f1, f2, f3; + uint8_t f1, f2, f3; /** Hide: used to indicate whether BezTriple is hidden (3D), * type of keyframe (eBezTriple_KeyframeType). */ @@ -143,7 +144,9 @@ typedef struct BPoint { /** Used for softbody goal weight. */ float weight; /** F1: selection status, hide: is point hidden or not. */ - short f1, hide; + uint8_t f1; + char _pad1[1]; + short hide; /** User-set radius per point for beveling etc. */ float radius; char _pad[4]; @@ -230,6 +233,8 @@ typedef struct Curve { struct Key *key; struct Material **mat; + struct CurveProfile *bevel_profile; + /* texture space, copied as one block in editobject.c */ float loc[3]; float size[3]; @@ -259,7 +264,8 @@ typedef struct Curve { char overflow; char spacemode, align_y; - char _pad[3]; + char bevel_mode; + char _pad[2]; /* font part */ short lines; @@ -383,6 +389,13 @@ enum { CU_ALIGN_Y_BOTTOM = 4, }; +/* Curve.bevel_mode */ +enum { + CU_BEV_MODE_ROUND = 0, + CU_BEV_MODE_OBJECT = 1, + CU_BEV_MODE_CURVE_PROFILE = 2, +}; + /* Curve.overflow. */ enum { CU_OVERFLOW_NONE = 0, |