diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:24:48 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:24:48 +0400 |
| commit | 843b45cafa618cd6230a16ca13f24860b3301b39 (patch) | |
| tree | a060fd0e5e36b7c84c7d140b42847234ac2c13c0 /source/blender/makesdna/DNA_object_types.h | |
| parent | e9d73dbba5a8a3e2c118eb63f9cdd0655aec3ac8 (diff) | |
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3da6d0fc99d..cf28f36ef77 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -241,6 +241,9 @@ 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 @@ -472,6 +475,9 @@ 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 |