Accidentally did a commit when I wanted to revert... (ignore my last revision)
[blender-staging.git] / source / blender / makesdna / DNA_object_types.h
index cf28f36ef771dbde3b1f79576a10d71a7c020e67..3da6d0fc99d5a8cca8e16a03a8346e01a41dfa1a 100644 (file)
@@ -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