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_color_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_color_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_color_types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index 9c00ec2f726..76746ef2759 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -90,7 +90,7 @@ typedef struct CurveMapping { float sample[3]; short tone; - short pad[3]; + char _pad[6]; } CurveMapping; /* cumapping->flag */ @@ -170,7 +170,7 @@ typedef struct Scopes { float *waveform_3; float *vecscope; int waveform_tot; - int pad; + char _pad[4]; } Scopes; /* scopes->wavefrm_mode */ @@ -182,7 +182,8 @@ typedef struct Scopes { #define SCOPES_WAVEFRM_RGB 5 typedef struct ColorManagedViewSettings { - int flag, pad; + int flag; + char _pad[4]; /** Look which is being applied when displaying buffer on the screen * (prior to view transform). */ char look[64]; @@ -194,7 +195,7 @@ typedef struct ColorManagedViewSettings { float gamma; /** Pre-display RGB curves transform. */ struct CurveMapping *curve_mapping; - void *pad2; + void *_pad2; } ColorManagedViewSettings; typedef struct ColorManagedDisplaySettings { |