Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_constraint_types.h
index 1be2c81..7107508 100644 (file)
@@ -406,6 +406,18 @@ typedef struct bShrinkwrapConstraint {
        char            pad[9];
 } bShrinkwrapConstraint;
 
+/* Follow Track constraints */
+typedef struct bFollowTrackConstraint {
+       struct MovieClip        *clip;
+       char    track[24];
+       int             flag, reference;
+} bFollowTrackConstraint;
+
+/* Camera Solver constraints */
+typedef struct bCameraSolverConstraint {
+       struct MovieClip        *clip;
+       int             flag, pad;
+} bCameraSolverConstraint;
 
 /* ------------------------------------------ */
 
@@ -440,6 +452,8 @@ typedef enum eBConstraint_Types {
        CONSTRAINT_TYPE_TRANSLIKE,                      /* Copy transform matrix */
        CONSTRAINT_TYPE_SAMEVOL,                        /* Maintain volume during scaling */
        CONSTRAINT_TYPE_PIVOT,                          /* Pivot Constraint */
+       CONSTRAINT_TYPE_FOLLOWTRACK,            /* Follow Track Constraint */
+       CONSTRAINT_TYPE_CAMERASOLVER,           /* Camera Solver Constraint */
        
        /* NOTE: no constraints are allowed to be added after this */
        NUM_CONSTRAINT_TYPES
@@ -737,6 +751,21 @@ typedef enum ePivotConstraint_Flag {
        PIVOTCON_FLAG_ROTACT_NEG        = (1<<1)
 } ePivotConstraint_Flag;
 
+/* FollowTrack Constraint -> flag */
+typedef enum eFollowTrack_Reference {
+       FOLLOWTRACK_TRACK               = (1<<0),
+       FOLLOWTRACK_BUNDLE              = (1<<1)
+} FollowTrack_Reference;
+
+typedef enum eFollowTrack_Flags {
+       FOLLOWTRACK_DEFAULTCLIP = (1<<0)
+} eFollowTrack_Flags;
+
+/* CameraSolver Constraint -> flag */
+typedef enum eCameraSolver_Flags {
+       CAMERASOLVER_DEFAULTCLIP        = (1<<0)
+} eCameraSolver_Flags;
+
 /* Rigid-Body Constraint */
 #define CONSTRAINT_DRAW_PIVOT 0x40
 #define        CONSTRAINT_DISABLE_LINKED_COLLISION 0x80