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_meta_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_meta_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meta_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 7ba66782cc0..f5bc9ef383a 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -41,7 +41,7 @@ typedef struct MetaElem { struct BoundBox *bb; short type, flag; - short pad[2]; + char _pad[4]; /** Position of center of MetaElem. */ float x, y, z; /** Rotation of MetaElem (MUST be kept normalized). */ @@ -81,7 +81,8 @@ typedef struct MetaBall { char flag, flag2; short totcol; /** Used to store MB_AUTOSPACE. */ - short texflag, pad; + short texflag; + char _pad[2]; /* texture space, copied as one block in editobject.c */ float loc[3]; |