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_image_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_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index b6ae324552f..bd0916c9b7e 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -48,13 +48,13 @@ typedef struct ImageUser { /** Offset within movie, start frame in global time. */ int offset, sfra; /** Cyclic flag. */ - char _pad, cycl; + char _pad0, cycl; char ok; /** Multiview current eye - for internal use of drawing routines. */ char multiview_eye; short pass; - short pad; + char _pad1[2]; /** Listbase indices, for menu browsing or retrieve buffer. */ short multi_index, view, layer; @@ -125,8 +125,7 @@ typedef struct Image { /* GPU texture flag. */ short gpuflag; - short pad2; - unsigned int pad3; + char _pad2[6]; /** Deprecated. */ struct PackedFile *packedfile DNA_DEPRECATED; @@ -135,7 +134,7 @@ typedef struct Image { int lastused; short ok; - short pad4[3]; + char _pad4[6]; /* for generated images */ int gen_x, gen_y; @@ -150,7 +149,7 @@ typedef struct Image { ColorManagedColorspaceSettings colorspace_settings; char alpha_mode; - char pad[5]; + char _pad[5]; /* Multiview */ /** For viewer node stereoscopy. */ |