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_dynamicpaint_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_dynamicpaint_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_dynamicpaint_types.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index 4d0083c215b..9f585ac21af 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -114,11 +114,13 @@ typedef struct DynamicPaintSurface { short effect_ui; /** Surface output id to preview. */ short preview_id; - short init_color_type, pad_s; + short init_color_type; + char _pad0[2]; int flags, effect; int image_resolution, substeps; - int start_frame, end_frame, pad; + int start_frame, end_frame; + char _pad[4]; /* initial color */ float init_color[4]; @@ -138,7 +140,7 @@ typedef struct DynamicPaintSurface { /* wave settings */ float wave_damping, wave_speed, wave_timescale, wave_spring, wave_smoothness; - int pad2; + char _pad2[4]; /** MAX_CUSTOMDATA_LAYER_NAME. */ char uvlayer_name[64]; @@ -171,7 +173,7 @@ typedef struct DynamicPaintCanvasSettings { struct ListBase surfaces; short active_sur, flags; - int pad; + char _pad[4]; /** Bake error description. */ char error[64]; @@ -267,7 +269,7 @@ typedef struct DynamicPaintBrushSettings { short proximity_falloff; short wave_type; short ray_dir; - short pad; + char _pad[2]; float wave_factor, wave_clamp; float max_velocity, smudge_strength; |