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_action_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_action_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index a52145a0416..ddea6f64dba 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -86,7 +86,7 @@ typedef struct bMotionPath { struct GPUVertBuf *points_vbo; struct GPUBatch *batch_line; struct GPUBatch *batch_points; - void *pad; + void *_pad; } bMotionPath; /* bMotionPath->flag */ @@ -120,7 +120,7 @@ typedef struct bAnimVizSettings { short path_viewflag; /** #eMotionPaths_BakeFlag. */ short path_bakeflag; - char pad[6]; + char _pad[6]; /** Start and end frames of path-calculation range. */ int path_sf, path_ef; @@ -185,7 +185,7 @@ struct Mat4; typedef struct bPoseChannel_Runtime { int bbone_segments; - char pad[4]; + char _pad[4]; /* Rest and posed matrices for segments. */ struct Mat4 *bbone_rest_mats; @@ -231,7 +231,7 @@ typedef struct bPoseChannel { char selectflag; char drawflag; char bboneflag DNA_DEPRECATED; - char pad0[4]; + char _pad0[4]; /** Set on read file or rebuild pose. */ struct Bone *bone; @@ -257,7 +257,7 @@ typedef struct bPoseChannel { struct bPoseChannel *custom_tx; float custom_scale; - char pad1[4]; + char _pad1[4]; /** Transforms - written in by actions or transform. */ float loc[3]; @@ -275,7 +275,7 @@ typedef struct bPoseChannel { float rotAxis[3], rotAngle; /** #eRotationModes - rotation representation to use. */ short rotmode; - short pad; + char _pad[2]; /** Matrix result of loc/quat/size, and where we put deform in, see next line */ float chan_mat[4][4]; @@ -460,10 +460,11 @@ typedef struct bPose { */ bPoseChannel **chan_array; - short flag, pad; + short flag; + char _pad[2]; /** Proxy layer: copy from armature, gets synced. */ unsigned int proxy_layer; - int pad1; + char _pad1[4]; /** Local action time of this pose. */ float ctime; @@ -660,7 +661,7 @@ typedef struct bAction { * (if 0, will be set to whatever ID first evaluates it). */ int idroot; - int pad; + char _pad[4]; } bAction; |