diff options
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 559ba446740..de34f101c31 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -56,6 +56,7 @@ struct ParticleSystem; struct DerivedMesh; struct SculptSession; struct bGPdata; +struct RigidBodyOb; /* Vertex Groups - Name Info */ @@ -170,7 +171,7 @@ typedef struct Object { float sf; /* sf is time-offset */ short flag; /* copy of Base */ - short colbits DNA_DEPRECATED; /* deprecated */ + short colbits DNA_DEPRECATED; /* deprecated, use 'matbits' */ short transflag, protectflag; /* transformation settings and transform locks */ short trackflag, upflag; @@ -218,10 +219,8 @@ typedef struct Object { char boundtype; /* bounding box use for drawing */ char collision_boundtype; /* bounding box type used for collision */ - char restrictflag; /* for restricting view, select, render etc. accessible in outliner */ - + short dtx; /* viewport draw extra settings */ char dt; /* viewport draw type */ - char dtx; /* viewport draw extra settings */ char empty_drawtype; float empty_drawsize; float dupfacesca; /* dupliface scale */ @@ -241,8 +240,9 @@ typedef struct Object { struct BulletSoftBody *bsoft; /* settings for game engine bullet soft body */ + char restrictflag; /* for restricting view, select, render etc. accessible in outliner */ + char recalc; /* dependency flag */ short softflag; /* softbody settings */ - short recalc; /* dependency flag */ float anisotropicFriction[3]; ListBase constraints; /* object constraints */ @@ -271,6 +271,9 @@ typedef struct Object { ListBase gpulamp; /* runtime, for glsl lamp display only */ ListBase pc_ids; ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */ + + struct RigidBodyOb *rigidbody_object; /* settings for Bullet rigid body */ + struct RigidBodyCon *rigidbody_constraint; /* settings for Bullet constraint */ float ima_ofs[2]; /* offset for image empties */ } Object; @@ -348,6 +351,9 @@ typedef struct DupliObject { #define OB_DATA_SUPPORT_ID(_id_type) \ (ELEM8(_id_type, ID_ME, ID_CU, ID_MB, ID_LA, ID_SPK, ID_CA, ID_LT, ID_AR)) +#define OB_DATA_SUPPORT_ID_CASE \ + ID_ME: case ID_CU: case ID_MB: case ID_LA: case ID_SPK: case ID_CA: case ID_LT: case ID_AR + /* partype: first 4 bits: type */ #define PARTYPE 15 #define PAROBJECT 0 @@ -406,17 +412,19 @@ typedef struct DupliObject { #define OB_PAINT 100 /* temporary used in draw code */ -/* dtx: flags, char! */ -#define OB_AXIS 2 -#define OB_TEXSPACE 4 -#define OB_DRAWNAME 8 -#define OB_DRAWIMAGE 16 +/* dtx: flags (short) */ +#define OB_DRAWBOUNDOX (1 << 0) +#define OB_AXIS (1 << 1) +#define OB_TEXSPACE (1 << 2) +#define OB_DRAWNAME (1 << 3) +#define OB_DRAWIMAGE (1 << 4) /* for solid+wire display */ -#define OB_DRAWWIRE 32 - /* for overdraw */ -#define OB_DRAWXRAY 64 +#define OB_DRAWWIRE (1 << 5) + /* for overdraw s*/ +#define OB_DRAWXRAY (1 << 6) /* enable transparent draw */ -#define OB_DRAWTRANSP 128 +#define OB_DRAWTRANSP (1 << 7) +#define OB_DRAW_ALL_EDGES (1 << 8) /* only for meshes currently */ /* empty_drawtype: no flags */ #define OB_ARROWS 1 |