diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 07:07:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 07:09:48 +0300 |
| commit | 6a03199b50e02d57a50eb24441ef7be0b7e965ac (patch) | |
| tree | a5e5374cb81742d2c2df05ecf315afaafcaf3d0e /source/blender/makesdna/DNA_curve_types.h | |
| parent | ea69d9858058e027a8b49d0cf313c8d4abb777a4 (diff) | |
Cleanup: use '_pad' convention for padding in all DNA structs
Avoids mixing these in with regular variables in code-completion.
Use char for pad members except for 'void *', to make size clearer.
Removed/shrink a few redundant padding vars which were >= 8 bytes.
Diffstat (limited to 'source/blender/makesdna/DNA_curve_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index ba7daf4d45e..5d1404028dc 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -128,7 +128,7 @@ typedef struct BezTriple { /** F5: used for auto handle to distinguish between normal handle and exception (extrema). */ char f5; - char pad[3]; + char _pad[3]; } BezTriple; /* note; alfa location in struct is abused by Key system */ @@ -139,7 +139,8 @@ typedef struct BPoint { /** F1: selection status, hide: is point hidden or not. */ short f1, hide; /** User-set radius per point for beveling etc. */ - float radius, pad; + float radius; + char _pad[4]; } BPoint; /** @@ -155,7 +156,7 @@ typedef struct Nurb { short hide, flag; /** Number of points in the U or V directions. */ int pntsu, pntsv; - short pad[2]; + char _pad[4]; /** Tessellation resolution in the U or V directions. */ short resolu, resolv; short orderu, orderv; @@ -178,8 +179,7 @@ typedef struct CharInfo { /** Index start at 1, unlike mesh & nurbs. */ short mat_nr; char flag; - char pad; - short pad2; + char _pad[3]; } CharInfo; typedef struct TextBox { @@ -196,7 +196,7 @@ typedef struct EditNurb { /* shape key being edited */ int shapenr; - char pad[4]; + char _pad[4]; } EditNurb; typedef struct Curve { @@ -248,7 +248,7 @@ typedef struct Curve { char overflow; char spacemode, align_y; - char pad[3]; + char _pad[3]; /* font part */ short lines; @@ -288,9 +288,8 @@ typedef struct Curve { float bevfac1, bevfac2; char bevfac1_mapping, bevfac2_mapping; - char pad2[2]; + char _pad2[6]; float fsize_realtime; - float pad3; void *batch_cache; } Curve; |