Revision: 53292
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53292
Author: mont29
Date: 2012-12-23 11:31:15 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Code cleanup: add usual 'BKE_' prefix to 'public' constraint functions from
blenkernel...
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_constraint.h
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_constraint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_constraint.h 2012-12-23
10:51:48 UTC (rev 53291)
+++ trunk/blender/source/blender/blenkernel/BKE_constraint.h 2012-12-23
11:31:15 UTC (rev 53292)
@@ -108,8 +108,8 @@
} 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 @@
/*
---------------------------------------------------------------------------- */
/* 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);
-int remove_constraint(ListBase *list, struct bConstraint *con);
-void remove_constraints_type(ListBase *list, short type, short last_only);
+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 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
}
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2012-12-23
10:51:48 UTC (rev 53291)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2012-12-23
11:31:15 UTC (rev 53292)
@@ -543,7 +543,7 @@
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 @@
pchan->mpath = NULL;
}
- free_constraints(&pchan->constraints);
+ BKE_free_constraints(&pchan->constraints);
if (pchan->prop) {
IDP_FreeProperty(pchan->prop);
@@ -711,7 +711,7 @@
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) {
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-12-23
10:51:48 UTC (rev 53291)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-12-23
11:31:15 UTC (rev 53292)
@@ -1620,15 +1620,16 @@
* 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 @@
/* 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) {
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-12-23
10:51:48 UTC (rev 53291)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-12-23
11:31:15 UTC (rev 53292)
@@ -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 @@
/* 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 @@
}
/* 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 @@
* 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 @@
/* use pose-space as stepping stone for other
spaces... */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
