diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:29:20 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:29:20 +0400 |
| commit | 47c7266522ac4c9e35a8aa227a6289fa7e50a7ad (patch) | |
| tree | fd0855db9c41f55399b033fa591f47e3b4306a28 /source/blender/makesdna/DNA_object_types.h | |
| parent | 843b45cafa618cd6230a16ca13f24860b3301b39 (diff) | |
Accidentally did a commit when I wanted to revert... (ignore my last revision)
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index cf28f36ef77..3da6d0fc99d 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -241,9 +241,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 depreceated... old animation system ListBase hooks DNA_DEPRECATED; // XXX depreceated... old animation system @@ -475,9 +472,6 @@ typedef struct DupliObject { /* controller state */ #define OB_MAX_STATES 30 -/* collision masks */ -#define OB_MAX_COL_MASKS 8 - /* ob->gameflag */ #define OB_DYNAMIC 1 #define OB_CHILD 2 |