NLA SoC: Merge from 2.5
[blender-staging.git] / source / blender / makesdna / DNA_constraint_types.h
index e78855b8de69065df36c7c3cd06fc4d1ef88dc47..79f032d0d21040334c471bfb1198d514d138bc88 100644 (file)
@@ -321,9 +321,11 @@ typedef struct bShrinkwrapConstraint {
        Object          *target;
        float           dist;                   /* distance to kept from target */
        short           shrinkType;             /* shrink type (look on MOD shrinkwrap for values) */
-       short           pad[5];
+       char            projAxis;               /* axis to project over UP_X, UP_Y, UP_Z */
+       char            pad[9];
 } bShrinkwrapConstraint;
 
+
 /* ------------------------------------------ */
 
 /* bConstraint->type 
@@ -353,7 +355,9 @@ typedef enum B_CONSTAINT_TYPES {
        CONSTRAINT_TYPE_TRANSFORM,                      /* transformation (loc/rot/size -> loc/rot/size) constraint */  
        CONSTRAINT_TYPE_SHRINKWRAP,                     /* shrinkwrap (loc/rot) constraint */
        
-       NUM_CONSTRAINT_TYPES
+       
+       /* NOTE: everytime a new constraint is added, update this */
+       NUM_CONSTRAINT_TYPES= CONSTRAINT_TYPE_SHRINKWRAP
 } B_CONSTRAINT_TYPES; 
 
 /* bConstraint->flag */
@@ -469,7 +473,9 @@ typedef enum B_CONSTRAINTCHANNEL_FLAG {
 /* bKinematicConstraint->flag */
 #define CONSTRAINT_IK_TIP              1
 #define CONSTRAINT_IK_ROT              2
+       /* targetless */
 #define CONSTRAINT_IK_AUTO             4
+       /* autoik */
 #define CONSTRAINT_IK_TEMP             8
 #define CONSTRAINT_IK_STRETCH  16
 #define CONSTRAINT_IK_POS              32
@@ -524,6 +530,7 @@ typedef enum B_CONSTRAINTCHANNEL_FLAG {
 
 /* Rigid-Body Constraint */
 #define CONSTRAINT_DRAW_PIVOT 0x40
+#define CONSTRAINT_DISABLE_LINKED_COLLISION 0x80
 
 /* important: these defines need to match up with PHY_DynamicTypes headerfile */
 #define CONSTRAINT_RB_BALL             1