diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-30 20:33:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-30 20:33:40 +0400 |
| commit | ec1f69ffce508efe191b40566594532e564b51f7 (patch) | |
| tree | 9570c4c29342cc743a8cccf65a19dce5d4ae8c67 /source/blender/makesdna/DNA_object_types.h | |
| parent | 3bf9bb3b13521c8bba4d559f308c5b2c04973df8 (diff) | |
style cleanup & re-use DNA pad var with new collision group object settings.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 932d209f2c7..29f6499986c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -209,7 +209,9 @@ typedef struct Object { float step_height; float jump_speed; float fall_speed; - char pad1[4]; + + /** Collision mask settings */ + unsigned short col_group, col_mask; short rotmode; /* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */ @@ -243,9 +245,6 @@ typedef struct Object { short recalc; /* dependency flag */ float anisotropicFriction[3]; - /** Collision mask settings */ - unsigned short col_group, col_mask, col_pad[2]; - ListBase constraints; /* object constraints */ ListBase nlastrips DNA_DEPRECATED; // XXX deprecated... old animation system ListBase hooks DNA_DEPRECATED; // XXX deprecated... old animation system |