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_object_force_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_object_force_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_force_types.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index de4026fddcd..c7bb3dad809 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -157,16 +157,18 @@ typedef struct PartDeflect { /** Runtime only : end of the curve. */ float drawvec2[4]; /** Runtime only. */ - float drawvec_falloff_min[3], pad1; + float drawvec_falloff_min[3]; + char _pad1[4]; /** Runtime only. */ - float drawvec_falloff_max[3], pad2; + float drawvec_falloff_max[3]; + char _pad2[4]; /** Force source object. */ struct Object *f_source; /** Friction of cloth collisions. */ float pdef_cfrict; - float pad; + char _pad[4]; } PartDeflect; typedef struct EffectorWeights { @@ -177,7 +179,7 @@ typedef struct EffectorWeights { float weight[14]; float global_gravity; short flag, rt[3]; - int pad; + char _pad[4]; } EffectorWeights; /* EffectorWeights->flag */ @@ -256,7 +258,7 @@ typedef struct PointCache { int last_exact; /** Used for editing cache - what is the last baked frame. */ int last_valid; - int pad; + char _pad[4]; /* for external cache files */ /** Number of cached points. */ @@ -302,7 +304,7 @@ typedef struct SoftBody { struct BodyPoint *bpoint; /** Not saved in file. */ struct BodySpring *bspring; - char pad; + char _pad; char msg_lock; short msg_value; @@ -389,7 +391,7 @@ typedef struct SoftBody { plastic, springpreload ; - /** Scratch pad/cache on live time not saved in file. */ + /** Scratchpad/cache on live time not saved in file. */ struct SBScratch *scratch; float shearstiff; float inpush; |