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_smoke_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_smoke_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index c8bed5ca936..9f8d3449d39 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -217,7 +217,7 @@ typedef struct SmokeDomainSettings { int openvdb_comp; char cache_file_format; char data_depth; - char pad[2]; + char _pad[2]; /* Smoke uses only one cache from now on (index [0]), * but keeping the array for now for reading old files. */ @@ -255,7 +255,7 @@ typedef struct SmokeDomainSettings { char interp_method; float clipping; - float pad3; + char _pad3[4]; } SmokeDomainSettings; @@ -316,7 +316,7 @@ typedef struct SmokeFlowSettings { /* texture control */ float texture_size; float texture_offset; - int pad; + char _pad[4]; /** MAX_CUSTOMDATA_LAYER_NAME. */ char uvlayer_name[64]; short vgroup_density; @@ -342,7 +342,7 @@ typedef struct SmokeCollSettings { float *verts_old; int numverts; short type; // static = 0, rigid = 1, dynamic = 2 - short pad; + char _pad[2]; } SmokeCollSettings; #endif |