diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-31 12:56:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-31 16:38:49 +0400 |
| commit | 847b7bcbeaa95311e9713a4ca77d8e3fbe91b5fb (patch) | |
| tree | cf872a75775343a6895a8a1332712633458f099a /source/blender/makesdna | |
| parent | c58f000e574236657886f96a66adfee37392ef72 (diff) | |
Code cleanup: pack BezTriple a little (though size remains same)
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 2d3a28fbd41..82ec02e01e9 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -109,18 +109,18 @@ typedef struct BezTriple { float vec[3][3]; float alfa, weight, radius; /* alfa: tilt in 3D View, weight: used for softbody goal weight, radius: for bevel tapering */ - short ipo; /* ipo: interpolation mode for segment from this BezTriple to the next */ + char ipo; /* ipo: interpolation mode for segment from this BezTriple to the next */ 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 easing; /* easing: easing type for interpolation mode (eBezTriple_Easing) */ float back; /* BEZT_IPO_BACK */ float amplitude, period; /* BEZT_IPO_ELASTIC */ - char easing; /* easing: easing type for interpolation mode (eBezTriple_Easing) */ - - char pad[3]; + + char pad[4]; } BezTriple; /* note; alfa location in struct is abused by Key system */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d584fd5adb0..4f5670d16c1 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -485,8 +485,9 @@ typedef struct UserDef { short glreslimit; short curssize; short color_picker_type; - short ipo_new; /* interpolation mode for newly added F-Curves */ - short keyhandles_new; /* handle types for newly added keyframes */ + char ipo_new; /* interpolation mode for newly added F-Curves */ + char keyhandles_new; /* handle types for newly added keyframes */ + char pad1[2]; short scrcastfps; /* frame rate for screencast to be played back */ short scrcastwait; /* milliseconds between screencast snapshots */ |