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_key_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_key_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_key_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index c916e45e764..d35ed7a755f 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -48,7 +48,7 @@ typedef struct KeyBlock { /** interpolation type (Key->type == KEY_NORMAL) only. */ short type; - short pad1; + char _pad1[2]; /** relative == 0 means first key is reference, otherwise the index of Key->blocks */ short relative; @@ -92,7 +92,7 @@ typedef struct Key { char elemstr[32]; /** Size of each element in #KeyBlock.data, use for allocation and stride. */ int elemsize; - int pad; + char _pad[4]; /** list of KeyBlock's */ ListBase block; @@ -106,7 +106,7 @@ typedef struct Key { short flag; /** absolute or relative shape key */ char type; - char pad2; + char _pad2; /** Only used when (Key->type == KEY_NORMAL), this value is used as a time slider, * rather then using the scenes time, this value can be animated to give greater control */ |