diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 09:05:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 09:06:11 +0300 |
commit | 1c3a098cc862b49826d80c2a02787fa89304d0ad (patch) | |
tree | fbcbd41e05a15719f828f2c068ea6305f9aa2356 | |
parent | 39e0b338d6983a895e4b97a7b06ae195e61b09d7 (diff) |
Cleanup: remove unnecessary "_pad*" members
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 58c78e0b41c..88461936bed 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -324,11 +324,22 @@ typedef struct Object { /** Object color. */ float col[4]; - /** For restricting view, select, render etc. accessible in outliner. */ - char restrictflag; - char _pad3; /** Softbody settings. */ short softflag; + + /** For restricting view, select, render etc. accessible in outliner. */ + char restrictflag; + + /** Flag for pinning. */ + char shapeflag; + /** Current shape key for menu or pinned. */ + short shapenr; + + char _pad3[2]; + + /** Smoothresh is phong interpolation ray_shadow correction in render. */ + float smoothresh; + char _pad4[4]; /** Object constraints. */ @@ -344,21 +355,11 @@ typedef struct Object { struct SoftBody *soft; /** Object duplicator for group. */ struct Collection *instance_collection; - void *_pad5; - - char _pad6; - /** Flag for pinning. */ - char shapeflag; - /** Current shape key for menu or pinned. */ - short shapenr; - /** Smoothresh is phong interpolation ray_shadow correction in render. */ - float smoothresh; /** If fluidsim enabled, store additional settings. */ struct FluidsimSettings *fluidsimSettings; struct DerivedMesh *derivedDeform, *derivedFinal; - void *_pad7; ListBase pc_ids; @@ -373,7 +374,9 @@ typedef struct Object { ImageUser *iuser; char empty_image_visibility_flag; char empty_image_depth; - char _pad8[6]; + char _pad8[2]; + + int select_color; /** Contains data for levels of detail. */ ListBase lodlevels; @@ -381,9 +384,6 @@ typedef struct Object { struct PreviewImage *preview; - int _pad9; - int select_color; - /** Runtime evaluation data (keep last). */ Object_Runtime runtime; } Object; |