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_cloth_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_cloth_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 5f4a124ea04..9ab873e1264 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -105,7 +105,7 @@ typedef struct ClothSimSettings { float bending_damping; /** Size of voxel grid cells for continuum dynamics. */ float voxel_cell_size; - int pad; + char _pad[4]; /** Number of time steps per frame. */ int stepsPerFrame; @@ -131,7 +131,7 @@ typedef struct ClothSimSettings { short presets; short reset; - char pad0[4]; + char _pad0[4]; struct EffectorWeights *effector_weights; short bending_model; @@ -171,12 +171,12 @@ typedef struct ClothCollSettings { short self_loop_count DNA_DEPRECATED; /** How many iterations for the collision loop. */ short loop_count; - int pad; + char _pad[4]; /** Only use colliders from this group of objects. */ struct Collection *group; /** Vgroup to paint which vertices are used for self collisions. */ short vgroup_selfcol; - short pad2[3]; + char _pad2[6]; /** Impulse clamp for object collisions. */ float clamp; /** Impulse clamp for self collisions. */ |