Code cleanup: add usual 'BKE_' prefix to 'public' constraint functions from blenkernel...
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Dec 2012 11:31:15 +0000 (11:31 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Dec 2012 11:31:15 +0000 (11:31 +0000)
30 files changed:
source/blender/blenkernel/BKE_constraint.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/keyframing.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/poseobject.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/ikplugin/intern/iksolver_plugin.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose.c
source/gameengine/Converter/BL_ArmatureObject.cpp

index 79e7512..c79dc62 100644 (file)
@@ -108,8 +108,8 @@ typedef struct bConstraintTypeInfo {
 } bConstraintTypeInfo;
 
 /* Function Prototypes for bConstraintTypeInfo's */
-bConstraintTypeInfo *constraint_get_typeinfo(struct bConstraint *con);
-bConstraintTypeInfo *get_constraint_typeinfo(int type);
+bConstraintTypeInfo *BKE_constraint_get_typeinfo(struct bConstraint *con);
+bConstraintTypeInfo *BKE_get_constraint_typeinfo(int type);
 
 /* ---------------------------------------------------------------------------- */
 /* Useful macros for testing various common flag combinations */
@@ -120,38 +120,38 @@ bConstraintTypeInfo *get_constraint_typeinfo(int type);
 /* ---------------------------------------------------------------------------- */
 
 /* Constraint function prototypes */
-void unique_constraint_name(struct bConstraint *con, struct ListBase *list);
+void BKE_unique_constraint_name(struct bConstraint *con, struct ListBase *list);
 
-void free_constraints(struct ListBase *list);
-void copy_constraints(struct ListBase *dst, const struct ListBase *src, int do_extern);
-void relink_constraints(struct ListBase *list);
-void id_loop_constraints(struct ListBase *list, ConstraintIDFunc func, void *userdata);
-void free_constraint_data(struct bConstraint *con);
+void BKE_free_constraints(struct ListBase *list);
+void BKE_copy_constraints(struct ListBase *dst, const struct ListBase *src, int do_extern);
+void BKE_relink_constraints(struct ListBase *list);
+void BKE_id_loop_constraints(struct ListBase *list, ConstraintIDFunc func, void *userdata);
+void BKE_free_constraint_data(struct bConstraint *con);
 
 /* Constraint API function prototypes */
-struct bConstraint *constraints_get_active(struct ListBase *list);
-void constraints_set_active(ListBase *list, struct bConstraint *con);
-struct bConstraint *constraints_findByName(struct ListBase *list, const char *name);
-       
-struct bConstraint *add_ob_constraint(struct Object *ob, const char *name, short type);
-struct bConstraint *add_pose_constraint(struct Object *ob, struct bPoseChannel *pchan, const char *name, short type);
+struct bConstraint *BKE_constraints_get_active(struct ListBase *list);
+void BKE_constraints_set_active(ListBase *list, struct bConstraint *con);
+struct bConstraint *BKE_constraints_findByName(struct ListBase *list, const char *name);
+
+struct bConstraint *BKE_add_ob_constraint(struct Object *ob, const char *name, short type);
+struct bConstraint *BKE_add_pose_constraint(struct Object *ob, struct bPoseChannel *pchan, const char *name, short type);
 
-int remove_constraint(ListBase *list, struct bConstraint *con);
-void remove_constraints_type(ListBase *list, short type, short last_only);
+int BKE_remove_constraint(ListBase *list, struct bConstraint *con);
+void BKE_remove_constraints_type(ListBase *list, short type, short last_only);
 
 /* Constraints + Proxies function prototypes */
-void extract_proxylocal_constraints(struct ListBase *dst, struct ListBase *src);
-short proxylocked_constraints_owner(struct Object *ob, struct bPoseChannel *pchan);
+void BKE_extract_proxylocal_constraints(struct ListBase *dst, struct ListBase *src);
+short BKE_proxylocked_constraints_owner(struct Object *ob, struct bPoseChannel *pchan);
 
 /* Constraint Evaluation function prototypes */
-struct bConstraintOb *constraints_make_evalob(struct Scene *scene, struct Object *ob, void *subdata, short datatype);
-void constraints_clear_evalob(struct bConstraintOb *cob);
+struct bConstraintOb *BKE_constraints_make_evalob(struct Scene *scene, struct Object *ob, void *subdata, short datatype);
+void BKE_constraints_clear_evalob(struct bConstraintOb *cob);
 
-void constraint_mat_convertspace(struct Object *ob, struct bPoseChannel *pchan, float mat[4][4], short from, short to);
+void BKE_constraint_mat_convertspace(struct Object *ob, struct bPoseChannel *pchan, float mat[4][4], short from, short to);
 
-void get_constraint_target_matrix(struct Scene *scene, struct bConstraint *con, int n, short ownertype, void *ownerdata, float mat[4][4], float ctime);
-void get_constraint_targets_for_solving(struct bConstraint *con, struct bConstraintOb *ob, struct ListBase *targets, float ctime);
-void solve_constraints(struct ListBase *conlist, struct bConstraintOb *cob, float ctime);
+void BKE_get_constraint_target_matrix(struct Scene *scene, struct bConstraint *con, int n, short ownertype, void *ownerdata, float mat[4][4], float ctime);
+void BKE_get_constraint_targets_for_solving(struct bConstraint *con, struct bConstraintOb *ob, struct ListBase *targets, float ctime);
+void BKE_solve_constraints(struct ListBase *conlist, struct bConstraintOb *cob, float ctime);
 
 #ifdef __cplusplus
 }
index 83d1538..63e12df 100644 (file)
@@ -543,7 +543,7 @@ void BKE_pose_copy_data(bPose **dst, bPose *src, int copycon)
        for (pchan = outPose->chanbase.first; pchan; pchan = pchan->next) {
                /* TODO: rename this argument... */
                if (copycon) {
-                       copy_constraints(&listb, &pchan->constraints, TRUE);  // copy_constraints NULLs listb
+                       BKE_copy_constraints(&listb, &pchan->constraints, TRUE);  // BKE_copy_constraints NULLs listb
                        pchan->constraints = listb;
                        pchan->mpath = NULL; /* motion paths should not get copied yet... */
                }
@@ -621,7 +621,7 @@ void BKE_pose_channel_free(bPoseChannel *pchan)
                pchan->mpath = NULL;
        }
 
-       free_constraints(&pchan->constraints);
+       BKE_free_constraints(&pchan->constraints);
        
        if (pchan->prop) {
                IDP_FreeProperty(pchan->prop);
@@ -711,7 +711,7 @@ void BKE_pose_channel_copy_data(bPoseChannel *pchan, const bPoseChannel *pchan_f
        pchan->iklinweight = pchan_from->iklinweight;
 
        /* constraints */
-       copy_constraints(&pchan->constraints, &pchan_from->constraints, TRUE);
+       BKE_copy_constraints(&pchan->constraints, &pchan_from->constraints, TRUE);
 
        /* id-properties */
        if (pchan->prop) {
index 9155d67..ad14dee 100644 (file)
@@ -1620,15 +1620,16 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected
                         *     2. copy proxy-pchan's constraints on-to new
                         *     3. add extracted local constraints back on top
                         *
-                        * Note for copy_constraints: when copying constraints, disable 'do_extern' otherwise
-                        *                            we get the libs direct linked in this blend. */
-                       extract_proxylocal_constraints(&proxylocal_constraints, &pchan->constraints);
-                       copy_constraints(&pchanw.constraints, &pchanp->constraints, FALSE);
+                        * Note for BKE_copy_constraints: when copying constraints, disable 'do_extern' otherwise
+                        *                                we get the libs direct linked in this blend.
+                        */
+                       BKE_extract_proxylocal_constraints(&proxylocal_constraints, &pchan->constraints);
+                       BKE_copy_constraints(&pchanw.constraints, &pchanp->constraints, FALSE);
                        BLI_movelisttolist(&pchanw.constraints, &proxylocal_constraints);
                        
                        /* constraints - set target ob pointer to own object */
                        for (con = pchanw.constraints.first; con; con = con->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -2426,15 +2427,15 @@ void BKE_pose_where_is_bone(Scene *scene, Object *ob, bPoseChannel *pchan, float
                        /* prepare PoseChannel for Constraint solving
                         * - makes a copy of matrix, and creates temporary struct to use
                         */
-                       cob = constraints_make_evalob(scene, ob, pchan, CONSTRAINT_OBTYPE_BONE);
+                       cob = BKE_constraints_make_evalob(scene, ob, pchan, CONSTRAINT_OBTYPE_BONE);
 
                        /* Solve PoseChannel's Constraints */
-                       solve_constraints(&pchan->constraints, cob, ctime); /* ctime doesnt alter objects */
+                       BKE_solve_constraints(&pchan->constraints, cob, ctime); /* ctime doesnt alter objects */
 
                        /* cleanup after Constraint Solving
                         * - applies matrix back to pchan, and frees temporary struct used
                         */
-                       constraints_clear_evalob(cob);
+                       BKE_constraints_clear_evalob(cob);
 
                        /* prevent constraints breaking a chain */
                        if (pchan->bone->flag & BONE_CONNECTED) {
index c3aab22..4874a3a 100644 (file)
@@ -96,7 +96,7 @@
 /* -------------- Naming -------------- */
 
 /* Find the first available, non-duplicate name for a given constraint */
-void unique_constraint_name(bConstraint *con, ListBase *list)
+void BKE_unique_constraint_name(bConstraint *con, ListBase *list)
 {
        BLI_uniquename(list, con, "Const", '.', offsetof(bConstraint, name), sizeof(con->name));
 }
@@ -105,7 +105,7 @@ void unique_constraint_name(bConstraint *con, ListBase *list)
 
 /* package an object/bone for use in constraint evaluation */
 /* This function MEM_calloc's a bConstraintOb struct, that will need to be freed after evaluation */
-bConstraintOb *constraints_make_evalob(Scene *scene, Object *ob, void *subdata, short datatype)
+bConstraintOb *BKE_constraints_make_evalob(Scene *scene, Object *ob, void *subdata, short datatype)
 {
        bConstraintOb *cob;
        
@@ -169,7 +169,7 @@ bConstraintOb *constraints_make_evalob(Scene *scene, Object *ob, void *subdata,
 }
 
 /* cleanup after constraint evaluation */
-void constraints_clear_evalob(bConstraintOb *cob)
+void BKE_constraints_clear_evalob(bConstraintOb *cob)
 {
        float delta[4][4], imat[4][4];
        
@@ -219,7 +219,7 @@ void constraints_clear_evalob(bConstraintOb *cob)
  * of a matrix from one space to another for constraint evaluation.
  * For now, this is only implemented for Objects and PoseChannels.
  */
-void constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[4][4], short from, short to)
+void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[4][4], short from, short to)
 {
        float diff_mat[4][4];
        float imat[4][4];
@@ -242,7 +242,7 @@ void constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[4][4
                                /* use pose-space as stepping stone for other spaces... */
                                if (ELEM(to, CONSTRAINT_SPACE_LOCAL, CONSTRAINT_SPACE_PARLOCAL)) {
                                        /* call self with slightly different values */
-                                       constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
+                                       BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
                                }
                        }
                        break;
@@ -278,7 +278,7 @@ void constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[4][4
                                /* use pose-space as stepping stone for other spaces */
                                if (ELEM(to, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_PARLOCAL)) {
                                        /* call self with slightly different values */
-                                       constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
+                                       BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
                                }
                        }
                        break;
@@ -293,7 +293,7 @@ void constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[4][4
                                /* use pose-space as stepping stone for other spaces */
                                if (ELEM(to, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL)) {
                                        /* call self with slightly different values */
-                                       constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
+                                       BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
                                }
                        }
                        break;
@@ -499,7 +499,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m
        /*      Case OBJECT */
        if (!strlen(substring)) {
                copy_m4_m4(mat, ob->obmat);
-               constraint_mat_convertspace(ob, NULL, mat, from, to);
+               BKE_constraint_mat_convertspace(ob, NULL, mat, from, to);
        }
        /*  Case VERTEXGROUP */
        /* Current method just takes the average location of all the points in the
@@ -512,11 +512,11 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m
         */
        else if (ob->type == OB_MESH) {
                contarget_get_mesh_mat(ob, substring, mat);
-               constraint_mat_convertspace(ob, NULL, mat, from, to);
+               BKE_constraint_mat_convertspace(ob, NULL, mat, from, to);
        }
        else if (ob->type == OB_LATTICE) {
                contarget_get_lattice_mat(ob, substring, mat);
-               constraint_mat_convertspace(ob, NULL, mat, from, to);
+               BKE_constraint_mat_convertspace(ob, NULL, mat, from, to);
        }
        /*      Case BONE */
        else {
@@ -549,7 +549,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m
                        copy_m4_m4(mat, ob->obmat);
                        
                /* convert matrix space as required */
-               constraint_mat_convertspace(ob, pchan, mat, from, to);
+               BKE_constraint_mat_convertspace(ob, pchan, mat, from, to);
        }
 }
 
@@ -4211,7 +4211,7 @@ static void constraints_init_typeinfo(void)
 /* This function should be used for getting the appropriate type-info when only
  * a constraint type is known
  */
-bConstraintTypeInfo *get_constraint_typeinfo(int type)
+bConstraintTypeInfo *BKE_get_constraint_typeinfo(int type)
 {
        /* initialize the type-info list? */
        if (CTI_INIT) {
@@ -4236,11 +4236,11 @@ bConstraintTypeInfo *get_constraint_typeinfo(int type)
 /* This function should always be used to get the appropriate type-info, as it
  * has checks which prevent segfaults in some weird cases.
  */
-bConstraintTypeInfo *constraint_get_typeinfo(bConstraint *con)
+bConstraintTypeInfo *BKE_constraint_get_typeinfo(bConstraint *con)
 {
        /* only return typeinfo for valid constraints */
        if (con)
-               return get_constraint_typeinfo(con->type);
+               return BKE_get_constraint_typeinfo(con->type);
        else
                return NULL;
 }
@@ -4252,7 +4252,7 @@ bConstraintTypeInfo *constraint_get_typeinfo(bConstraint *con)
  
 /* ---------- Data Management ------- */
 
-/* helper function for free_constraint_data() - unlinks references */
+/* helper function for BKE_free_constraint_data() - unlinks references */
 static void con_unlink_refs_cb(bConstraint *UNUSED(con), ID **idpoin, short isReference, void *UNUSED(userData))
 {
        if (*idpoin && isReference)
@@ -4263,10 +4263,10 @@ static void con_unlink_refs_cb(bConstraint *UNUSED(con), ID **idpoin, short isRe
  * be sure to run BIK_clear_data() when freeing an IK constraint,
  * unless DAG_scene_sort is called. 
  */
-void free_constraint_data(bConstraint *con)
+void BKE_free_constraint_data(bConstraint *con)
 {
        if (con->data) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                
                if (cti) {
                        /* perform any special freeing constraint may have */
@@ -4284,13 +4284,13 @@ void free_constraint_data(bConstraint *con)
 }
 
 /* Free all constraints from a constraint-stack */
-void free_constraints(ListBase *list)
+void BKE_free_constraints(ListBase *list)
 {
        bConstraint *con;
        
        /* Free constraint data and also any extra data */
        for (con = list->first; con; con = con->next)
-               free_constraint_data(con);
+               BKE_free_constraint_data(con);
        
        /* Free the whole list */
        BLI_freelistN(list);
@@ -4298,10 +4298,10 @@ void free_constraints(ListBase *list)
 
 
 /* Remove the specified constraint from the given constraint stack */
-int remove_constraint(ListBase *list, bConstraint *con)
+int BKE_remove_constraint(ListBase *list, bConstraint *con)
 {
        if (con) {
-               free_constraint_data(con);
+               BKE_free_constraint_data(con);
                BLI_freelinkN(list, con);
                return 1;
        }
@@ -4310,7 +4310,7 @@ int remove_constraint(ListBase *list, bConstraint *con)
 }
 
 /* Remove all the constraints of the specified type from the given constraint stack */
-void remove_constraints_type(ListBase *list, short type, short last_only)
+void BKE_remove_constraints_type(ListBase *list, short type, short last_only)
 {
        bConstraint *con, *conp;
        
@@ -4322,7 +4322,7 @@ void remove_constraints_type(ListBase *list, short type, short last_only)
                conp = con->prev;
                
                if (con->type == type) {
-                       remove_constraint(list, con);
+                       BKE_remove_constraint(list, con);
                        if (last_only) 
                                return;
                }
@@ -4335,7 +4335,7 @@ void remove_constraints_type(ListBase *list, short type, short last_only)
 static bConstraint *add_new_constraint_internal(const char *name, short type)
 {
        bConstraint *con = MEM_callocN(sizeof(bConstraint), "Constraint");
-       bConstraintTypeInfo *cti = get_constraint_typeinfo(type);
+       bConstraintTypeInfo *cti = BKE_get_constraint_typeinfo(type);
        const char *newName;
 
        /* Set up a generic constraint datablock */
@@ -4385,17 +4385,17 @@ static bConstraint *add_new_constraint(Object *ob, bPoseChannel *pchan, const ch
                 * (otherwise unique-naming code will fail, since it assumes element exists in list)
                 */
                BLI_addtail(list, con);
-               unique_constraint_name(con, list);
+               BKE_unique_constraint_name(con, list);
                
                /* if the target list is a list on some PoseChannel belonging to a proxy-protected
                 * Armature layer, we must tag newly added constraints with a flag which allows them
                 * to persist after proxy syncing has been done
                 */
-               if (proxylocked_constraints_owner(ob, pchan))
+               if (BKE_proxylocked_constraints_owner(ob, pchan))
                        con->flag |= CONSTRAINT_PROXY_LOCAL;
                
                /* make this constraint the active one */
-               constraints_set_active(list, con);
+               BKE_constraints_set_active(list, con);
        }
 
        /* set type+owner specific immutable settings */
@@ -4419,7 +4419,7 @@ static bConstraint *add_new_constraint(Object *ob, bPoseChannel *pchan, const ch
 /* ......... */
 
 /* Add new constraint for the given bone */
-bConstraint *add_pose_constraint(Object *ob, bPoseChannel *pchan, const char *name, short type)
+bConstraint *BKE_add_pose_constraint(Object *ob, bPoseChannel *pchan, const char *name, short type)
 {
        if (pchan == NULL)
                return NULL;
@@ -4428,14 +4428,14 @@ bConstraint *add_pose_constraint(Object *ob, bPoseChannel *pchan, const char *na
 }
 
 /* Add new constraint for the given object */
-bConstraint *add_ob_constraint(Object *ob, const char *name, short type)
+bConstraint *BKE_add_ob_constraint(Object *ob, const char *name, short type)
 {
        return add_new_constraint(ob, NULL, name, type);
 }
 
 /* ......... */
 
-/* helper for relink_constraints() - call ID_NEW() on every ID reference the constraint has */
+/* helper for BKE_relink_constraints() - call ID_NEW() on every ID reference the constraint has */
 static void con_relink_id_cb(bConstraint *UNUSED(con), ID **idpoin, short UNUSED(isReference), void *UNUSED(userdata))
 {
        /* ID_NEW() expects a struct with inline "id" member as first
@@ -4449,20 +4449,20 @@ static void con_relink_id_cb(bConstraint *UNUSED(con), ID **idpoin, short UNUSED
 }
 
 /* Reassign links that constraints have to other data (called during file loading?) */
-void relink_constraints(ListBase *conlist)
+void BKE_relink_constraints(ListBase *conlist)
 {
        /* just a wrapper around ID-loop for just calling ID_NEW() on all ID refs */
-       id_loop_constraints(conlist, con_relink_id_cb, NULL);
+       BKE_id_loop_constraints(conlist, con_relink_id_cb, NULL);
 }
 
 
 /* Run the given callback on all ID-blocks in list of constraints */
-void id_loop_constraints(ListBase *conlist, ConstraintIDFunc func, void *userdata)
+void BKE_id_loop_constraints(ListBase *conlist, ConstraintIDFunc func, void *userdata)
 {
        bConstraint *con;
        
        for (con = conlist->first; con; con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                
                if (cti) {
                        if (cti->id_looper)
@@ -4473,14 +4473,14 @@ void id_loop_constraints(ListBase *conlist, ConstraintIDFunc func, void *userdat
 
 /* ......... */
 
-/* helper for copy_constraints(), to be used for making sure that ID's are valid */
+/* helper for BKE_copy_constraints(), to be used for making sure that ID's are valid */
 static void con_extern_cb(bConstraint *UNUSED(con), ID **idpoin, short UNUSED(isReference), void *UNUSED(userData))
 {
        if (*idpoin && (*idpoin)->lib)
                id_lib_extern(*idpoin);
 }
 
-/* helper for copy_constraints(), to be used for making sure that usercounts of copied ID's are fixed up */
+/* helper for BKE_copy_constraints(), to be used for making sure that usercounts of copied ID's are fixed up */
 static void con_fix_copied_refs_cb(bConstraint *UNUSED(con), ID **idpoin, short isReference, void *UNUSED(userData))
 {
        /* increment usercount if this is a reference type */
@@ -4489,7 +4489,7 @@ static void con_fix_copied_refs_cb(bConstraint *UNUSED(con), ID **idpoin, short
 }
 
 /* duplicate all of the constraints in a constraint stack */
-void copy_constraints(ListBase *dst, const ListBase *src, int do_extern)
+void BKE_copy_constraints(ListBase *dst, const ListBase *src, int do_extern)
 {
        bConstraint *con, *srccon;
        
@@ -4497,7 +4497,7 @@ void copy_constraints(ListBase *dst, const ListBase *src, int do_extern)
        BLI_duplicatelist(dst, src);
        
        for (con = dst->first, srccon = src->first; con && srccon; srccon = srccon->next, con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                
                /* make a new copy of the constraint's data */
                con->data = MEM_dupallocN(con->data);
@@ -4524,13 +4524,13 @@ void copy_constraints(ListBase *dst, const ListBase *src, int do_extern)
 
 /* ......... */
 
-bConstraint *constraints_findByName(ListBase *list, const char *name)
+bConstraint *BKE_constraints_findByName(ListBase *list, const char *name)
 {
        return BLI_findstring(list, name, offsetof(bConstraint, name));
 }
 
 /* finds the 'active' constraint in a constraint stack */
-bConstraint *constraints_get_active(ListBase *list)
+bConstraint *BKE_constraints_get_active(ListBase *list)
 {
        bConstraint *con;
        
@@ -4547,7 +4547,7 @@ bConstraint *constraints_get_active(ListBase *list)
 }
 
 /* Set the given constraint as the active one (clearing all the others) */
-void constraints_set_active(ListBase *list, bConstraint *con)
+void BKE_constraints_set_active(ListBase *list, bConstraint *con)
 {
        bConstraint *c;
        
@@ -4564,7 +4564,7 @@ void constraints_set_active(ListBase *list, bConstraint *con)
 /* -------- Constraints and Proxies ------- */
 
 /* Rescue all constraints tagged as being CONSTRAINT_PROXY_LOCAL (i.e. added to bone that's proxy-synced in this file) */
-void extract_proxylocal_constraints(ListBase *dst, ListBase *src)
+void BKE_extract_proxylocal_constraints(ListBase *dst, ListBase *src)
 {
        bConstraint *con, *next;
        
@@ -4581,7 +4581,7 @@ void extract_proxylocal_constraints(ListBase *dst, ListBase *src)
 }
 
 /* Returns if the owner of the constraint is proxy-protected */
-short proxylocked_constraints_owner(Object *ob, bPoseChannel *pchan)
+short BKE_proxylocked_constraints_owner(Object *ob, bPoseChannel *pchan)
 {
        /* Currently, constraints can only be on object or bone level */
        if (ob && ob->proxy) {
@@ -4610,9 +4610,9 @@ short proxylocked_constraints_owner(Object *ob, bPoseChannel *pchan)
  * None of the actual calculations of the matrices should be done here! Also, this function is
  * not to be used by any new constraints, particularly any that have multiple targets.
  */
-void get_constraint_target_matrix(struct Scene *scene, bConstraint *con, int n, short ownertype, void *ownerdata, float mat[4][4], float ctime)
+void BKE_get_constraint_target_matrix(struct Scene *scene, bConstraint *con, int n, short ownertype, void *ownerdata, float mat[4][4], float ctime)
 {
-       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
        ListBase targets = {NULL, NULL};
        bConstraintOb *cob;
        bConstraintTarget *ct;
@@ -4679,9 +4679,9 @@ void get_constraint_target_matrix(struct Scene *scene, bConstraint *con, int n,
 }
 
 /* Get the list of targets required for solving a constraint */
-void get_constraint_targets_for_solving(bConstraint *con, bConstraintOb *cob, ListBase *targets, float ctime)
+void BKE_get_constraint_targets_for_solving(bConstraint *con, bConstraintOb *cob, ListBase *targets, float ctime)
 {
-       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
        
        if (cti && cti->get_constraint_targets) {
                bConstraintTarget *ct;
@@ -4711,10 +4711,10 @@ void get_constraint_targets_for_solving(bConstraint *con, bConstraintOb *cob, Li
 /* This function is called whenever constraints need to be evaluated. Currently, all
  * constraints that can be evaluated are everytime this gets run.
  *
- * constraints_make_evalob and constraints_clear_evalob should be called before and 
+ * BKE_constraints_make_evalob and BKE_constraints_clear_evalob should be called before and 
  * after running this function, to sort out cob
  */
-void solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
+void BKE_solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
 {
        bConstraint *con;
        float oldmat[4][4];
@@ -4726,7 +4726,7 @@ void solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
        
        /* loop over available constraints, solving and blending them */
        for (con = conlist->first; con; con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                ListBase targets = {NULL, NULL};
                
                /* these we can skip completely (invalid constraints...) */
@@ -4746,10 +4746,10 @@ void solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
                copy_m4_m4(oldmat, cob->matrix);
                
                /* move owner matrix into right space */
-               constraint_mat_convertspace(cob->ob, cob->pchan, cob->matrix, CONSTRAINT_SPACE_WORLD, con->ownspace);
+               BKE_constraint_mat_convertspace(cob->ob, cob->pchan, cob->matrix, CONSTRAINT_SPACE_WORLD, con->ownspace);
                
                /* prepare targets for constraint solving */
-               get_constraint_targets_for_solving(con, cob, &targets, ctime);
+               BKE_get_constraint_targets_for_solving(con, cob, &targets, ctime);
                
                /* Solve the constraint and put result in cob->matrix */
                cti->evaluate_constraint(con, cob, &targets);
@@ -4764,7 +4764,7 @@ void solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
                
                /* move owner back into worldspace for next constraint/other business */
                if ((con->flag & CONSTRAINT_SPACEONCE) == 0) 
-                       constraint_mat_convertspace(cob->ob, cob->pchan, cob->matrix, con->ownspace, CONSTRAINT_SPACE_WORLD);
+                       BKE_constraint_mat_convertspace(cob->ob, cob->pchan, cob->matrix, con->ownspace, CONSTRAINT_SPACE_WORLD);
                        
                /* Interpolate the enforcement, to blend result of constraint into final owner transform 
                 *  - all this happens in worldspace to prevent any weirdness creeping in ([#26014] and [#25725]),
index 6ba140f..4238956 100644 (file)
@@ -472,7 +472,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                        
                        for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
                                for (con = pchan->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        ListBase targets = {NULL, NULL};
                                        bConstraintTarget *ct;
                                        
@@ -754,7 +754,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
        
        /* object constraints */
        for (con = ob->constraints.first; con; con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                ListBase targets = {NULL, NULL};
                bConstraintTarget *ct;
                
@@ -2295,7 +2295,7 @@ static void dag_object_time_update_flags(Object *ob)
        if (ob->constraints.first) {
                bConstraint *con;
                for (con = ob->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                        ListBase targets = {NULL, NULL};
                        bConstraintTarget *ct;
                        
@@ -2738,7 +2738,7 @@ static void dag_id_flush_update(Scene *sce, ID *id)
                        for (obt = bmain->object.first; obt; obt = obt->id.next) {
                                bConstraint *con;
                                for (con = obt->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        if (ELEM3(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER,
                                                  CONSTRAINT_TYPE_OBJECTSOLVER))
                                        {
@@ -3030,7 +3030,7 @@ void DAG_pose_sort(Object *ob)
                        addtoroot = 0;
                }
                for (con = pchan->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                        ListBase targets = {NULL, NULL};
                        bConstraintTarget *ct;
                        
index 23fae2e..0efbd92 100644 (file)
@@ -529,7 +529,7 @@ static int subframe_updateObject(Scene *scene, Object *ob, int flags, float fram
 
                /* also update constraint targets */
                for (con = ob->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                        ListBase targets = {NULL, NULL};
 
                        if (cti && cti->get_constraint_targets) {
index 5e01773..1511ac5 100644 (file)
@@ -1192,7 +1192,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar)
                                        
                                        /* extract transform just like how the constraints do it! */
                                        copy_m4_m4(mat, pchan->pose_mat);
-                                       constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
+                                       BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
                                        
                                        /* ... and from that, we get our transform */
                                        copy_v3_v3(tmp_loc, mat[3]);
@@ -1217,7 +1217,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar)
                                        
                                        /* extract transform just like how the constraints do it! */
                                        copy_m4_m4(mat, ob->obmat);
-                                       constraint_mat_convertspace(ob, NULL, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL);
+                                       BKE_constraint_mat_convertspace(ob, NULL, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL);
                                        
                                        /* ... and from that, we get our transform */
                                        copy_v3_v3(tmp_loc, mat[3]);
@@ -1288,7 +1288,7 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
                        if (dtar->flag & DTAR_FLAG_LOCAL_CONSTS) {
                                /* just like how the constraints do it! */
                                copy_m4_m4(mat, pchan->pose_mat);
-                               constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
+                               BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
                        }
                        else {
                                /* specially calculate local matrix, since chan_mat is not valid 
@@ -1315,7 +1315,7 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
                        if (dtar->flag & DTAR_FLAG_LOCAL_CONSTS) {
                                /* just like how the constraints do it! */
                                copy_m4_m4(mat, ob->obmat);
-                               constraint_mat_convertspace(ob, NULL, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL);
+                               BKE_constraint_mat_convertspace(ob, NULL, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL);
                        }
                        else {
                                /* transforms to matrix */
index 4156b5b..69e368f 100644 (file)
@@ -1325,7 +1325,7 @@ void BKE_movieclip_unlink(Main *bmain, MovieClip *clip)
                bConstraint *con;
 
                for (con = ob->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
 
                        if (cti->type == CONSTRAINT_TYPE_FOLLOWTRACK) {
                                bFollowTrackConstraint *data = (bFollowTrackConstraint *) con->data;
index 9a54e09..99b163c 100644 (file)
@@ -349,7 +349,7 @@ void BKE_object_free(Object *ob)
        free_controllers(&ob->controllers);
        free_actuators(&ob->actuators);
        
-       free_constraints(&ob->constraints);
+       BKE_free_constraints(&ob->constraints);
        
        free_partdeflect(ob->pd);
 
@@ -434,7 +434,7 @@ void BKE_object_unlink(Object *ob)
                        bPoseChannel *pchan;
                        for (pchan = obt->pose->chanbase.first; pchan; pchan = pchan->next) {
                                for (con = pchan->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        ListBase targets = {NULL, NULL};
                                        bConstraintTarget *ct;
                                        
@@ -465,7 +465,7 @@ void BKE_object_unlink(Object *ob)
                sca_remove_ob_poin(obt, ob);
                
                for (con = obt->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                        ListBase targets = {NULL, NULL};
                        bConstraintTarget *ct;
                        
@@ -1129,7 +1129,7 @@ static void copy_object_pose(Object *obn, Object *ob)
                }
                
                for (con = chan->constraints.first; con; con = con->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                        ListBase targets = {NULL, NULL};
                        bConstraintTarget *ct;
                        
@@ -1229,7 +1229,7 @@ static Object *object_copy_do(Object *ob, int copy_caches)
                        BKE_pose_rebuild(obn, obn->data);
        }
        defgroup_copy_list(&obn->defbase, &ob->defbase);
-       copy_constraints(&obn->constraints, &ob->constraints, TRUE);
+       BKE_copy_constraints(&obn->constraints, &ob->constraints, TRUE);
 
        obn->mode = 0;
        obn->sculpt = NULL;
@@ -2113,9 +2113,9 @@ void BKE_object_where_is_calc_time(Scene *scene, Object *ob, float ctime)
        if (ob->constraints.first && !(ob->transflag & OB_NO_CONSTRAINTS)) {
                bConstraintOb *cob;
                
-               cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
-               solve_constraints(&ob->constraints, cob, ctime);
-               constraints_clear_evalob(cob);
+               cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
+               BKE_solve_constraints(&ob->constraints, cob, ctime);
+               BKE_constraints_clear_evalob(cob);
        }
        
        /* set negative scale flag in object */
@@ -2184,9 +2184,9 @@ void BKE_object_where_is_calc_simul(Scene *scene, Object *ob)
        if (ob->constraints.first) {
                bConstraintOb *cob;
                
-               cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
-               solve_constraints(&ob->constraints, cob, (float)scene->r.cfra);
-               constraints_clear_evalob(cob);
+               cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
+               BKE_solve_constraints(&ob->constraints, cob, (float)scene->r.cfra);
+               BKE_constraints_clear_evalob(cob);
        }
 }
 
@@ -3134,11 +3134,11 @@ void BKE_object_relink(Object *ob)
        if (ob->id.lib)
                return;
 
-       relink_constraints(&ob->constraints);
+       BKE_relink_constraints(&ob->constraints);
        if (ob->pose) {
                bPoseChannel *chan;
                for (chan = ob->pose->chanbase.first; chan; chan = chan->next) {
-                       relink_constraints(&chan->constraints);
+                       BKE_relink_constraints(&chan->constraints);
                }
        }
        modifiers_foreachIDLink(ob, copy_object__forwardModifierLinks, NULL);
index 38d41db..81101e0 100644 (file)
@@ -2535,7 +2535,7 @@ static void lib_link_constraints(FileData *fd, ID *id, ListBase *conlist)
        cld.fd = fd;
        cld.id = id;
        
-       id_loop_constraints(conlist, lib_link_constraint_cb, &cld);
+       BKE_id_loop_constraints(conlist, lib_link_constraint_cb, &cld);
 }
 
 static void direct_link_constraints(FileData *fd, ListBase *lb)
@@ -7504,7 +7504,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        for (ob = main->object.first; ob; ob = ob->id.next) {
                                bConstraint *con;
                                for (con = ob->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        
                                        if (!cti)
                                                continue;
@@ -9186,7 +9186,7 @@ static void expand_constraints(FileData *fd, Main *mainvar, ListBase *lb)
        ced.fd = fd;
        ced.mainvar = mainvar;
        
-       id_loop_constraints(lb, expand_constraint_cb, &ced);
+       BKE_id_loop_constraints(lb, expand_constraint_cb, &ced);
        
        /* deprecated manual expansion stuff */
        for (curcon = lb->first; curcon; curcon = curcon->next) {
index 8a56e3c..2e783ac 100644 (file)
@@ -545,7 +545,7 @@ void blo_do_version_old_trackto_to_constraints(Object *ob)
 {
        /* create new trackto constraint from the relationship */
        if (ob->track) {
-               bConstraint *con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
+               bConstraint *con = BKE_add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
                bTrackToConstraint *data = con->data;
 
                /* copy tracking settings from the object */
index f82883a..7ce10d1 100644 (file)
@@ -1228,7 +1228,7 @@ static void write_constraints(WriteData *wd, ListBase *conlist)
        bConstraint *con;
 
        for (con=conlist->first; con; con=con->next) {
-               bConstraintTypeInfo *cti= constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti= BKE_constraint_get_typeinfo(con);
                
                /* Write the specific data */
                if (cti && con->data) {
index aee53fe..9add193 100644 (file)
@@ -716,7 +716,7 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
                 * will be what owns the pose-channel that is getting this anyway.
                 */
                copy_m4_m4(tmat, pchan->pose_mat);
-               constraint_mat_convertspace(ob, pchan, tmat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
+               BKE_constraint_mat_convertspace(ob, pchan, tmat, CONSTRAINT_SPACE_POSE, CONSTRAINT_SPACE_LOCAL);
                rotmode = pchan->rotmode;
                
                /* Loc code is specific... */
index ae405c0..3731437 100644 (file)
@@ -812,7 +812,7 @@ static void joined_armature_fix_links(Object *tarArm, Object *srcArm, bPoseChann
                        pose = ob->pose;
                        for (pchant = pose->chanbase.first; pchant; pchant = pchant->next) {
                                for (con = pchant->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        ListBase targets = {NULL, NULL};
                                        bConstraintTarget *ct;
                                        
@@ -859,7 +859,7 @@ static void joined_armature_fix_links(Object *tarArm, Object *srcArm, bPoseChann
                /* fix object-level constraints */
                if (ob != srcArm) {
                        for (con = ob->constraints.first; con; con = con->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -1032,7 +1032,7 @@ static void separated_armature_fix_links(Object *origArm, Object *newArm)
                if (ob->type == OB_ARMATURE) {
                        for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
                                for (con = pchan->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        ListBase targets = {NULL, NULL};
                                        bConstraintTarget *ct;
                                        
@@ -1070,7 +1070,7 @@ static void separated_armature_fix_links(Object *origArm, Object *newArm)
                /* fix object-level constraints */
                if (ob != origArm) {
                        for (con = ob->constraints.first; con; con = con->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -1712,7 +1712,7 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op))
                        }
                        else {
                                for (con = pchan->constraints.first; con; con = con->next) {
-                                       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                        ListBase targets = {NULL, NULL};
                                        bConstraintTarget *ct;
                                        
@@ -2523,7 +2523,7 @@ void updateDuplicateSubtargetObjects(EditBone *dupBone, ListBase *editbones, Obj
                                /* does this constraint have a subtarget in
                                 * this armature?
                                 */
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(curcon);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(curcon);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -5533,7 +5533,7 @@ static void constraint_bone_name_fix(Object *ob, ListBase *conlist, char *oldnam
        bConstraintTarget *ct;
        
        for (curcon = conlist->first; curcon; curcon = curcon->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(curcon);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(curcon);
                ListBase targets = {NULL, NULL};
                
                if (cti && cti->get_constraint_targets) {
index be3e037..3e34a4c 100644 (file)
@@ -725,7 +725,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
                /* DO SOME MAGIC HERE */
                for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
                        for (con = pchan->constraints.first; con; con = con->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -850,7 +850,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
                                /* DO SOME MAGIC HERE */
                                for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
                                        for (con = pchan->constraints.first; con; con = con->next) {
-                                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                                ListBase targets = {NULL, NULL};
                                                bConstraintTarget *ct;
                                                
index 576e598..49d4b67 100644 (file)
@@ -417,7 +417,7 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op
        {
                if (pchan->bone->flag & BONE_SELECTED) {
                        for (con = pchan->constraints.first; con; con = con->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -925,7 +925,7 @@ static void pose_copy_menu(Scene *scene)
                                                /* copy constraints to tmpbase and apply 'local' tags before 
                                                 * appending to list of constraints for this channel
                                                 */
-                                               copy_constraints(&tmp_constraints, &pchanact->constraints, TRUE);
+                                               BKE_copy_constraints(&tmp_constraints, &pchanact->constraints, TRUE);
                                                if ((ob->proxy) && (pchan->bone->layer & arm->layer_protected)) {
                                                        bConstraint *con;
                                                        
@@ -1034,7 +1034,7 @@ static void pose_copy_menu(Scene *scene)
                                /* copy constraints to tmpbase and apply 'local' tags before 
                                 * appending to list of constraints for this channel
                                 */
-                               copy_constraints(&tmp_constraints, &const_copy, TRUE);
+                               BKE_copy_constraints(&tmp_constraints, &const_copy, TRUE);
                                if ((ob->proxy) && (pchan->bone->layer & arm->layer_protected)) {
                                        /* add proxy-local tags */
                                        for (con = tmp_constraints.first; con; con = con->next)
index 6983723..4e0776e 100644 (file)
@@ -1080,7 +1080,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
        // int rb_col; // UNUSED
 
        /* get constraint typeinfo */
-       cti = constraint_get_typeinfo(con);
+       cti = BKE_constraint_get_typeinfo(con);
        if (cti == NULL) {
                /* exception for 'Null' constraint - it doesn't have constraint typeinfo! */
                BLI_strncpy(typestr, (con->type == CONSTRAINT_TYPE_NULL) ? "Null" : "Unknown", sizeof(typestr));
@@ -1089,7 +1089,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
                BLI_strncpy(typestr, cti->name, sizeof(typestr));
                
        /* determine whether constraint is proxy protected or not */
-       if (proxylocked_constraints_owner(ob, pchan))
+       if (BKE_proxylocked_constraints_owner(ob, pchan))
                proxy_protected = (con->flag & CONSTRAINT_PROXY_LOCAL) == 0;
        else
                proxy_protected = 0;
@@ -1151,7 +1151,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
                 *
                 *  Up/Down buttons should only be shown (or not grayed - todo) if they serve some purpose.
                 */
-               if (proxylocked_constraints_owner(ob, pchan)) {
+               if (BKE_proxylocked_constraints_owner(ob, pchan)) {
                        if (con->prev) {
                                prev_proxylock = (con->prev->flag & CONSTRAINT_PROXY_LOCAL) ? 0 : 1;
                        }
index f78e120..6cb7cd5 100644 (file)
@@ -141,7 +141,7 @@ ListBase *get_constraint_lb(Object *ob, bConstraint *con, bPoseChannel **pchan_r
 /* single constraint */
 bConstraint *get_active_constraint(Object *ob)
 {
-       return constraints_get_active(get_active_constraints(ob));
+       return BKE_constraints_get_active(get_active_constraints(ob));
 }
 
 /* -------------- Constraint Management (Add New, Remove, Rename) -------------------- */
@@ -225,7 +225,7 @@ static void update_pyconstraint_cb(void *arg1, void *arg2)
 /* helper function for add_constriant - sets the last target for the active constraint */
 static void set_constraint_nth_target(bConstraint *con, Object *target, const char subtarget[], int index)
 {
-       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
        ListBase targets = {NULL, NULL};
        bConstraintTarget *ct;
        int num_targets, i;
@@ -297,7 +297,7 @@ static void test_constraints(Object *owner, bPoseChannel *pchan)
        /* Check all constraints - is constraint valid? */
        if (conlist) {
                for (curcon = conlist->first; curcon; curcon = curcon->next) {
-                       bConstraintTypeInfo *cti = constraint_get_typeinfo(curcon);
+                       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(curcon);
                        ListBase targets = {NULL, NULL};
                        bConstraintTarget *ct;
                        
@@ -610,7 +610,7 @@ static bConstraint *edit_constraint_property_get(wmOperator *op, Object *ob, int
                list = get_active_constraints(ob);
        }
        
-       con = constraints_findByName(list, constraint_name);
+       con = BKE_constraints_findByName(list, constraint_name);
        //if (G.debug & G_DEBUG)
        //printf("constraint found = %p, %s\n", (void *)con, (con)?con->name:"<Not found>");
 
@@ -1123,7 +1123,7 @@ void ED_object_constraint_set_active(Object *ob, bConstraint *con)
        if ((lb && con) && (con->flag & CONSTRAINT_ACTIVE))
                return;
        
-       constraints_set_active(lb, con);
+       BKE_constraints_set_active(lb, con);
 }
 
 void ED_object_constraint_update(Object *ob)
@@ -1162,9 +1162,9 @@ static int constraint_delete_exec(bContext *C, wmOperator *UNUSED(op))
        const short is_ik = ELEM(con->type, CONSTRAINT_TYPE_KINEMATIC, CONSTRAINT_TYPE_SPLINEIK);
 
        /* free the constraint */
-       if (remove_constraint(lb, con)) {
+       if (BKE_remove_constraint(lb, con)) {
                /* there's no active constraint now, so make sure this is the case */
-               constraints_set_active(lb, NULL);
+               BKE_constraints_set_active(lb, NULL);
                
                ED_object_constraint_update(ob); /* needed to set the flags on posebones correctly */
                
@@ -1308,7 +1308,7 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
        /* free constraints for all selected bones */
        CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
        {
-               free_constraints(&pchan->constraints);
+               BKE_free_constraints(&pchan->constraints);
                pchan->constflag &= ~(PCHAN_HAS_IK | PCHAN_HAS_SPLINEIK | PCHAN_HAS_CONST);
        }
        CTX_DATA_END;
@@ -1346,7 +1346,7 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
        /* do freeing */
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
        {
-               free_constraints(&ob->constraints);
+               BKE_free_constraints(&ob->constraints);
                DAG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;
@@ -1391,7 +1391,7 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op)
        {
                /* if we're not handling the object we're copying from, copy all constraints over */
                if (pchan != chan) {
-                       copy_constraints(&chan->constraints, &pchan->constraints, TRUE);
+                       BKE_copy_constraints(&chan->constraints, &pchan->constraints, TRUE);
                        /* update flags (need to add here, not just copy) */
                        chan->constflag |= pchan->constflag;
                }
@@ -1432,7 +1432,7 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op))
        {
                /* if we're not handling the object we're copying from, copy all constraints over */
                if (obact != ob) {
-                       copy_constraints(&ob->constraints, &obact->constraints, TRUE);
+                       BKE_copy_constraints(&ob->constraints, &obact->constraints, TRUE);
                        DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
        }
@@ -1642,9 +1642,9 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
        
        /* create a new constraint of the type requried, and add it to the active/given constraints list */
        if (pchan)
-               con = add_pose_constraint(ob, pchan, NULL, type);
+               con = BKE_add_pose_constraint(ob, pchan, NULL, type);
        else
-               con = add_ob_constraint(ob, NULL, type);
+               con = BKE_add_ob_constraint(ob, NULL, type);
        
        /* get the first selected object/bone, and make that the target
         *      - apart from the buttons-window add buttons, we shouldn't add in this way
@@ -1940,7 +1940,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op))
                for (con = pchan->constraints.first; con; con = next) {
                        next = con->next;
                        if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
-                               remove_constraint(&pchan->constraints, con);
+                               BKE_remove_constraint(&pchan->constraints, con);
                        }
                }
                pchan->constflag &= ~(PCHAN_HAS_IK | PCHAN_HAS_TARGET);
index c9492d8..fcc3b5d 100644 (file)
@@ -954,7 +954,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
                                }
                                else if (event == 22) {
                                        /* Copy the constraint channels over */
-                                       copy_constraints(&base->object->constraints, &ob->constraints, TRUE);
+                                       BKE_copy_constraints(&base->object->constraints, &ob->constraints, TRUE);
                                        
                                        do_scene_sort = TRUE;
                                }
index 0988a19..fa44d3d 100644 (file)
@@ -716,12 +716,12 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
                                bFollowPathConstraint *data;
                                float cmat[4][4], vec[3];
                                
-                               con = add_ob_constraint(ob, "AutoPath", CONSTRAINT_TYPE_FOLLOWPATH);
+                               con = BKE_add_ob_constraint(ob, "AutoPath", CONSTRAINT_TYPE_FOLLOWPATH);
                                
                                data = con->data;
                                data->tar = par;
                                
-                               get_constraint_target_matrix(scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
+                               BKE_get_constraint_target_matrix(scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
                                sub_v3_v3v3(vec, ob->obmat[3], cmat[3]);
                                
                                ob->loc[0] = vec[0];
@@ -1051,7 +1051,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
                for (con = ob->constraints.last; con; con = pcon) {
                        pcon = con->prev;
                        if (ELEM3(con->type, CONSTRAINT_TYPE_TRACKTO, CONSTRAINT_TYPE_LOCKTRACK, CONSTRAINT_TYPE_DAMPTRACK))
-                               remove_constraint(&ob->constraints, con);
+                               BKE_remove_constraint(&ob->constraints, con);
                }
                
                if (type == 1)
@@ -1109,7 +1109,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
                {
                        if (ob != obact) {
-                               con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_DAMPTRACK);
+                               con = BKE_add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_DAMPTRACK);
 
                                data = con->data;
                                data->tar = obact;
@@ -1129,7 +1129,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
                {
                        if (ob != obact) {
-                               con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
+                               con = BKE_add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
 
                                data = con->data;
                                data->tar = obact;
@@ -1151,7 +1151,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
                {
                        if (ob != obact) {
-                               con = add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_LOCKTRACK);
+                               con = BKE_add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_LOCKTRACK);
 
                                data = con->data;
                                data->tar = obact;
index 77662d8..56a890c 100644 (file)
@@ -1801,7 +1801,7 @@ static void object_solver_inverted_matrix(Scene *scene, Object *ob, float invmat
        int found = FALSE;
 
        for (con = ob->constraints.first; con; con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
 
                if (!cti)
                        continue;
@@ -1832,7 +1832,7 @@ static Object *object_solver_camera(Scene *scene, Object *ob)
        bConstraint *con;
 
        for (con = ob->constraints.first; con; con = con->next) {
-               bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
 
                if (!cti)
                        continue;
index 0184942..6edbd3f 100644 (file)
@@ -6885,10 +6885,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
                        UI_make_axis_color(col1, col2, 'Z');
                        glColor3ubv(col2);
                        
-                       cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
+                       cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
                        
                        for (curcon = list->first; curcon; curcon = curcon->next) {
-                               bConstraintTypeInfo *cti = constraint_get_typeinfo(curcon);
+                               bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(curcon);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
                                
@@ -6942,7 +6942,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
                                }
                        }
                        
-                       constraints_clear_evalob(cob);
+                       BKE_constraints_clear_evalob(cob);
                }
        }
 
index b2ee17b..f861d41 100644 (file)
@@ -2258,8 +2258,8 @@ static void protectedQuaternionBits(short protectflag, float *quat, float *oldqu
 static void constraintTransLim(TransInfo *t, TransData *td)
 {
        if (td->con) {
-               bConstraintTypeInfo *ctiLoc = get_constraint_typeinfo(CONSTRAINT_TYPE_LOCLIMIT);
-               bConstraintTypeInfo *ctiDist = get_constraint_typeinfo(CONSTRAINT_TYPE_DISTLIMIT);
+               bConstraintTypeInfo *ctiLoc = BKE_get_constraint_typeinfo(CONSTRAINT_TYPE_LOCLIMIT);
+               bConstraintTypeInfo *ctiDist = BKE_get_constraint_typeinfo(CONSTRAINT_TYPE_DISTLIMIT);
                
                bConstraintOb cob = {NULL};
                bConstraint *con;
@@ -2309,7 +2309,7 @@ static void constraintTransLim(TransInfo *t, TransData *td)
                                }
                                
                                /* get constraint targets if needed */
-                               get_constraint_targets_for_solving(con, &cob, &targets, ctime);
+                               BKE_get_constraint_targets_for_solving(con, &cob, &targets, ctime);
                                
                                /* do constraint */
                                cti->evaluate_constraint(con, &cob, &targets);
@@ -2361,7 +2361,7 @@ static void constraintob_from_transdata(bConstraintOb *cob, TransData *td)
 static void constraintRotLim(TransInfo *UNUSED(t), TransData *td)
 {
        if (td->con) {
-               bConstraintTypeInfo *cti = get_constraint_typeinfo(CONSTRAINT_TYPE_ROTLIMIT);
+               bConstraintTypeInfo *cti = BKE_get_constraint_typeinfo(CONSTRAINT_TYPE_ROTLIMIT);
                bConstraintOb cob;
                bConstraint *con;
                int do_limit = FALSE;
@@ -2428,7 +2428,7 @@ static void constraintRotLim(TransInfo *UNUSED(t), TransData *td)
 static void constraintSizeLim(TransInfo *t, TransData *td)
 {
        if (td->con && td->ext) {
-               bConstraintTypeInfo *cti = get_constraint_typeinfo(CONSTRAINT_TYPE_SIZELIMIT);
+               bConstraintTypeInfo *cti = BKE_get_constraint_typeinfo(CONSTRAINT_TYPE_SIZELIMIT);
                bConstraintOb cob = {NULL};
                bConstraint *con;
                float size_sign[3], size_abs[3];
index 7da4742..8e27530 100644 (file)
@@ -835,7 +835,7 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
                }
        }
 
-       con = add_pose_constraint(NULL, pchan, "TempConstraint", CONSTRAINT_TYPE_KINEMATIC);
+       con = BKE_add_pose_constraint(NULL, pchan, "TempConstraint", CONSTRAINT_TYPE_KINEMATIC);
        pchan->constflag |= (PCHAN_HAS_IK | PCHAN_HAS_TARGET);    /* for draw, but also for detecting while pose solving */
        data = con->data;
        if (targetless) {
index 75aaa23..67f0694 100644 (file)
@@ -372,7 +372,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
                /* 1.0=ctime, we pass on object for auto-ik (owner-type here is object, even though
                 * strictly speaking, it is a posechannel)
                 */
-               get_constraint_target_matrix(scene, target->con, 0, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0);
+               BKE_get_constraint_target_matrix(scene, target->con, 0, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0);
 
                /* and set and transform goal */
                mult_m4_m4m4(goal, goalinv, rootmat);
@@ -383,7 +383,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 
                /* same for pole vector target */
                if (data->poletar) {
-                       get_constraint_target_matrix(scene, target->con, 1, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0);
+                       BKE_get_constraint_target_matrix(scene, target->con, 1, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0);
 
                        if (data->flag & CONSTRAINT_IK_SETANGLE) {
                                /* don't solve IK when we are setting the pole angle */
index 903080d..ef992e1 100644 (file)
@@ -551,7 +551,7 @@ static bool target_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Fram
        bConstraint *constraint = (bConstraint *)target->blenderConstraint;
        float tarmat[4][4];
 
-       get_constraint_target_matrix(target->blscene, constraint, 0, CONSTRAINT_OBTYPE_OBJECT, target->owner, tarmat, 1.0);
+       BKE_get_constraint_target_matrix(target->blscene, constraint, 0, CONSTRAINT_OBTYPE_OBJECT, target->owner, tarmat, 1.0);
 
        // rootmat contains the target pose in world coordinate
        // if enforce is != 1.0, blend the target position with the end effector position
@@ -620,7 +620,7 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame&
                IK_Channel &rootchan = ikscene->channels[0];
 
                // get polar target matrix in world space
-               get_constraint_target_matrix(ikscene->blscene, ikscene->polarConstraint, 1, CONSTRAINT_OBTYPE_OBJECT, ikscene->blArmature, mat, 1.0);
+               BKE_get_constraint_target_matrix(ikscene->blscene, ikscene->polarConstraint, 1, CONSTRAINT_OBTYPE_OBJECT, ikscene->blArmature, mat, 1.0);
                // convert to armature space
                mult_m4_m4m4(polemat, imat, mat);
                // get the target in world space (was computed before as target object are defined before base object)
index 30a9bfd..84b7080 100644 (file)
@@ -214,7 +214,7 @@ static void rna_Constraint_name_set(PointerRNA *ptr, const char *value)
                
                /* if we have the list, check for unique name, otherwise give up */
                if (list)
-                       unique_constraint_name(con, list);
+                       BKE_unique_constraint_name(con, list);
        }
        
        /* fix all the animation data which may link to this */
@@ -293,7 +293,7 @@ static EnumPropertyItem *rna_Constraint_target_space_itemf(bContext *UNUSED(C),
                                                            PropertyRNA *UNUSED(prop), int *UNUSED(free))
 {
        bConstraint *con = (bConstraint *)ptr->data;
-       bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
+       bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
        ListBase targets = {NULL, NULL};
        bConstraintTarget *ct;
        
index b218cc6..8a67d92 100644 (file)
@@ -1252,20 +1252,20 @@ static PointerRNA rna_Object_collision_get(PointerRNA *ptr)
 static PointerRNA rna_Object_active_constraint_get(PointerRNA *ptr)
 {
        Object *ob = (Object *)ptr->id.data;
-       bConstraint *con = constraints_get_active(&ob->constraints);
+       bConstraint *con = BKE_constraints_get_active(&ob->constraints);
        return rna_pointer_inherit_refine(ptr, &RNA_Constraint, con);
 }
 
 static void rna_Object_active_constraint_set(PointerRNA *ptr, PointerRNA value)
 {
        Object *ob = (Object *)ptr->id.data;
-       constraints_set_active(&ob->constraints, (bConstraint *)value.data);
+       BKE_constraints_set_active(&ob->constraints, (bConstraint *)value.data);
 }
 
 static bConstraint *rna_Object_constraints_new(Object *object, int type)
 {
        WM_main_add_notifier(NC_OBJECT | ND_CONSTRAINT | NA_ADDED, object);
-       return add_ob_constraint(object, NULL, type);
+       return BKE_add_ob_constraint(object, NULL, type);
 }
 
 static void rna_Object_constraints_remove(Object *object, ReportList *reports, PointerRNA *con_ptr)
@@ -1276,7 +1276,7 @@ static void rna_Object_constraints_remove(Object *object, ReportList *reports, P
                return;
        }
 
-       remove_constraint(&object->constraints, con);
+       BKE_remove_constraint(&object->constraints, con);
        RNA_POINTER_INVALIDATE(con_ptr);
 
        ED_object_constraint_update(object);
@@ -1286,7 +1286,7 @@ static void rna_Object_constraints_remove(Object *object, ReportList *reports, P
 
 static void rna_Object_constraints_clear(Object *object)
 {
-       free_constraints(&object->constraints);
+       BKE_free_constraints(&object->constraints);
 
        ED_object_constraint_update(object);
        ED_object_constraint_set_active(object, NULL);
index 28d1de2..87ef3c9 100644 (file)
@@ -472,14 +472,14 @@ static void rna_pose_pgroup_name_set(PointerRNA *ptr, const char *value, char *r
 static PointerRNA rna_PoseChannel_active_constraint_get(PointerRNA *ptr)
 {
        bPoseChannel *pchan = (bPoseChannel *)ptr->data;
-       bConstraint *con = constraints_get_active(&pchan->constraints);
+       bConstraint *con = BKE_constraints_get_active(&pchan->constraints);
        return rna_pointer_inherit_refine(ptr, &RNA_Constraint, con);
 }
 
 static void rna_PoseChannel_active_constraint_set(PointerRNA *ptr, PointerRNA value)
 {
        bPoseChannel *pchan = (bPoseChannel *)ptr->data;
-       constraints_set_active(&pchan->constraints, (bConstraint *)value.data);
+       BKE_constraints_set_active(&pchan->constraints, (bConstraint *)value.data);
 }
 
 static bConstraint *rna_PoseChannel_constraints_new(bPoseChannel *pchan, int type)
@@ -487,7 +487,7 @@ static bConstraint *rna_PoseChannel_constraints_new(bPoseChannel *pchan, int typ
        /*WM_main_add_notifier(NC_OBJECT|ND_CONSTRAINT|NA_ADDED, object); */
        /* TODO, pass object also */
        /* TODO, new pose bones don't have updated draw flags */
-       return add_pose_constraint(NULL, pchan, NULL, type);
+       return BKE_add_pose_constraint(NULL, pchan, NULL, type);
 }
 
 static void rna_PoseChannel_constraints_remove(ID *id, bPoseChannel *pchan, ReportList *reports, PointerRNA *con_ptr)
@@ -501,12 +501,12 @@ static void rna_PoseChannel_constraints_remove(ID *id, bPoseChannel *pchan, Repo
                return;
        }
 
-       remove_constraint(&pchan->constraints, con);
+       BKE_remove_constraint(&pchan->constraints, con);
        RNA_POINTER_INVALIDATE(con_ptr);
 
        ED_object_constraint_update(ob);
 
-       constraints_set_active(&pchan->constraints, NULL);  /* XXX, is this really needed? - Campbell */
+       BKE_constraints_set_active(&pchan->constraints, NULL);  /* XXX, is this really needed? - Campbell */
 
        WM_main_add_notifier(NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, id);
 
index 1f1c404..395a57d 100644 (file)
@@ -112,7 +112,8 @@ void game_copy_pose(bPose **dst, bPose *src, int copy_constraint)
                if (copy_constraint) {
                        ListBase listb;
                        // copy all constraint for backward compatibility
-                       copy_constraints(&listb, &pchan->constraints, FALSE);  // copy_constraints NULLs listb, no need to make extern for this operation.
+                       // BKE_copy_constraints NULLs listb, no need to make extern for this operation.
+                       BKE_copy_constraints(&listb, &pchan->constraints, FALSE);
                        pchan->constraints= listb;
                } else {
                        pchan->constraints.first = NULL;
@@ -304,7 +305,7 @@ void BL_ArmatureObject::LoadConstraints(KX_BlenderSceneConverter* converter)
                        case CONSTRAINT_TYPE_TRANSFORM:
                        case CONSTRAINT_TYPE_DISTLIMIT:
                        case CONSTRAINT_TYPE_TRANSLIKE:
-                               cti = constraint_get_typeinfo(pcon);
+                               cti = BKE_constraint_get_typeinfo(pcon);
                                gametarget = gamesubtarget = NULL;
                                if (cti && cti->get_constraint_targets) {
                                        ListBase listb = { NULL, NULL };