replace VECCOPY and QUATCOPY with inline funcs.

1 files changed, 38 insertions, 38 deletions

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 2ebede13d70..9fba18dd7cf 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -390,11 +390,11 @@ static void equalize_bezier(float *data, int desired)
 	
 	pdist[0]= 0.0f;
 	for(a=0, fp= data; a<MAX_BBONE_SUBDIV; a++, fp+=4) {
-		QUATCOPY(temp[a], fp);
+		copy_qt_qt(temp[a], fp);
 		pdist[a+1]= pdist[a]+len_v3v3(fp, fp+4);
 	}
 	/* do last point */
-	QUATCOPY(temp[a], fp);
+	copy_qt_qt(temp[a], fp);
 	totdist= pdist[a];
 	
 	/* go over distances and calculate new points */
@@ -420,7 +420,7 @@ static void equalize_bezier(float *data, int desired)
 		fp[3]= fac1*temp[nr-1][3]+ fac2*temp[nr][3];
 	}
 	/* set last point, needed for orientation calculus */
-	QUATCOPY(fp, temp[MAX_BBONE_SUBDIV]);
+	copy_qt_qt(fp, temp[MAX_BBONE_SUBDIV]);
 }
 
 /* returns pointer to static array, filled with desired amount of bone->segments elements */
@@ -488,9 +488,9 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 
 		/* transform previous point inside this bone space */
 		if(rest)
-			VECCOPY(h1, prev->bone->arm_head)
+			copy_v3_v3(h1, prev->bone->arm_head);
 		else
-			VECCOPY(h1, prev->pose_head)
+			copy_v3_v3(h1, prev->pose_head);
 		mul_m4_v3(imat, h1);
 
 		if(prev->bone->segments>1) {
@@ -527,9 +527,9 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 		
 		/* transform next point inside this bone space */
 		if(rest)
-			VECCOPY(h2, next->bone->arm_tail)
+			copy_v3_v3(h2, next->bone->arm_tail);
 		else
-			VECCOPY(h2, next->pose_tail)
+			copy_v3_v3(h2, next->pose_tail);
 		mul_m4_v3(imat, h2);
 		/* if next bone is B-bone too, use average handle direction */
 		if(next->bone->segments>1);
@@ -575,7 +575,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 		vec_roll_to_mat3(h1, fp[3], mat3);		// fp[3] is roll
 
 		copy_m4_m3(result_array[a].mat, mat3);
-		VECCOPY(result_array[a].mat[3], fp);
+		copy_v3_v3(result_array[a].mat[3], fp);
 
 		if(doscale) {
 			/* correct for scaling when this matrix is used in scaled space */
@@ -737,7 +737,7 @@ static float dist_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, f
 
 	if(bone==NULL) return 0.0f;
 	
-	VECCOPY (cop, co);
+	copy_v3_v3(cop, co);
 
 	fac= distfactor_to_bone(cop, bone->arm_head, bone->arm_tail, bone->rad_head, bone->rad_tail, bone->dist);
 	
@@ -782,7 +782,7 @@ static void pchan_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, f
 	if (!weight)
 		return;
 
-	VECCOPY(cop, co);
+	copy_v3_v3(cop, co);
 
 	if(vec) {
 		if(pchan->bone->segments>1)
@@ -1019,7 +1019,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm,
 				normalize_dq(dq, contrib);
 
 				if(armature_weight != 1.0f) {
-					VECCOPY(dco, co);
+					copy_v3_v3(dco, co);
 					mul_v3m3_dq( dco, (defMats)? summat: NULL,dq);
 					sub_v3_v3(dco, co);
 					mul_v3_fl(dco, armature_weight);
@@ -1115,11 +1115,11 @@ void armature_loc_world_to_pose(Object *ob, float *inloc, float *outloc)
 	float nLocMat[4][4];
 	
 	/* build matrix for location */
-	VECCOPY(xLocMat[3], inloc);
+	copy_v3_v3(xLocMat[3], inloc);
 
 	/* get bone-space cursor matrix and extract location */
 	armature_mat_world_to_pose(ob, xLocMat, nLocMat);
-	VECCOPY(outloc, nLocMat[3]);
+	copy_v3_v3(outloc, nLocMat[3]);
 }
 
 /* Convert Pose-Space Matrix to Bone-Space Matrix 
@@ -1194,11 +1194,11 @@ void armature_loc_pose_to_bone(bPoseChannel *pchan, float *inloc, float *outloc)
 	float nLocMat[4][4];
 	
 	/* build matrix for location */
-	VECCOPY(xLocMat[3], inloc);
+	copy_v3_v3(xLocMat[3], inloc);
 
 	/* get bone-space cursor matrix and extract location */
 	armature_mat_pose_to_bone(pchan, xLocMat, nLocMat);
-	VECCOPY(outloc, nLocMat[3]);
+	copy_v3_v3(outloc, nLocMat[3]);
 }
 
 /* same as object_mat3_to_rot() */
@@ -1403,7 +1403,7 @@ void where_is_armature_bone(Bone *bone, Bone *prevbone)
 		copy_m4_m3(offs_bone, bone->bone_mat);
 				
 		/* The bone's root offset (is in the parent's coordinate system) */
-		VECCOPY(offs_bone[3], bone->head);
+		copy_v3_v3(offs_bone[3], bone->head);
 
 		/* Get the length translation of parent (length along y axis) */
 		offs_bone[3][1]+= prevbone->length;
@@ -1413,7 +1413,7 @@ void where_is_armature_bone(Bone *bone, Bone *prevbone)
 	}
 	else {
 		copy_m4_m3(bone->arm_mat, bone->bone_mat);
-		VECCOPY(bone->arm_mat[3], bone->head);
+		copy_v3_v3(bone->arm_mat[3], bone->head);
 	}
 	
 	/* and the kiddies */
@@ -1849,8 +1849,8 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 	/* firstly, calculate the bone matrix the standard way, since this is needed for roll control */
 	where_is_pose_bone(scene, ob, pchan, ctime, 1);
 	
-	VECCOPY(poseHead, pchan->pose_head);
-	VECCOPY(poseTail, pchan->pose_tail);
+	copy_v3_v3(poseHead, pchan->pose_head);
+	copy_v3_v3(poseTail, pchan->pose_tail);
 	
 	/* step 1: determine the positions for the endpoints of the bone */
 	{
@@ -1894,7 +1894,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 			
 			/* store the position, and convert it to pose space */
 			mul_m4_v3(ob->imat, vec);
-			VECCOPY(poseHead, vec);
+			copy_v3_v3(poseHead, vec);
 			
 			/* set the new radius (it should be the average value) */
 			radius = (radius+rad) / 2;
@@ -1918,9 +1918,9 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 		/* compute the raw rotation matrix from the bone's current matrix by extracting only the
 		 * orientation-relevant axes, and normalising them
 		 */
-		VECCOPY(rmat[0], pchan->pose_mat[0]);
-		VECCOPY(rmat[1], pchan->pose_mat[1]);
-		VECCOPY(rmat[2], pchan->pose_mat[2]);
+		copy_v3_v3(rmat[0], pchan->pose_mat[0]);
+		copy_v3_v3(rmat[1], pchan->pose_mat[1]);
+		copy_v3_v3(rmat[2], pchan->pose_mat[2]);
 		normalize_m3(rmat);
 		
 		/* also, normalise the orientation imposed by the bone, now that we've extracted the scale factor */
@@ -2011,7 +2011,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 		/* when the 'no-root' option is affected, the chain can retain
 		 * the shape but be moved elsewhere
 		 */
-		VECCOPY(poseHead, pchan->pose_head);
+		copy_v3_v3(poseHead, pchan->pose_head);
 	}
 	else if (tree->con->enforce < 1.0f) {
 		/* when the influence is too low
@@ -2019,18 +2019,18 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
 		 *	- stick to the parent for any other
 		 */
 		if (pchan->parent) {
-			VECCOPY(poseHead, pchan->pose_head);
+			copy_v3_v3(poseHead, pchan->pose_head);
 		}
 		else {
 			// FIXME: this introduces popping artifacts when we reach 0.0
 			interp_v3_v3v3(poseHead, pchan->pose_head, poseHead, tree->con->enforce);
 		}
 	}
-	VECCOPY(poseMat[3], poseHead);
+	copy_v3_v3(poseMat[3], poseHead);
 	
 	/* finally, store the new transform */
 	copy_m4_m4(pchan->pose_mat, poseMat);
-	VECCOPY(pchan->pose_head, poseHead);
+	copy_v3_v3(pchan->pose_head, poseHead);
 	
 	/* recalculate tail, as it's now outdated after the head gets adjusted above! */
 	where_is_pose_bone_tail(pchan);
@@ -2109,7 +2109,7 @@ void pchan_to_mat4(bPoseChannel *pchan, float chan_mat[4][4])
 	/* prevent action channels breaking chains */
 	/* need to check for bone here, CONSTRAINT_TYPE_ACTION uses this call */
 	if ((pchan->bone==NULL) || !(pchan->bone->flag & BONE_CONNECTED)) {
-		VECCOPY(chan_mat[3], pchan->loc);
+		copy_v3_v3(chan_mat[3], pchan->loc);
 	}
 }
 
@@ -2195,11 +2195,11 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha
 						ofs = amod->turbul / 200.0f;
 						
 						/* make a copy of starting conditions */
-						VECCOPY(loc, pchan->pose_mat[3]);
+						copy_v3_v3(loc, pchan->pose_mat[3]);
 						mat4_to_eul( eul,pchan->pose_mat);
 						mat4_to_size( size,pchan->pose_mat);
-						VECCOPY(eulo, eul);
-						VECCOPY(sizeo, size);
+						copy_v3_v3(eulo, eul);
+						copy_v3_v3(sizeo, size);
 						
 						/* apply noise to each set of channels */
 						if (amod->channels & 4) {
@@ -2250,7 +2250,7 @@ void where_is_pose_bone_tail(bPoseChannel *pchan)
 {
 	float vec[3];
 	
-	VECCOPY(vec, pchan->pose_mat[1]);
+	copy_v3_v3(vec, pchan->pose_mat[1]);
 	mul_v3_fl(vec, pchan->bone->length);
 	add_v3_v3v3(pchan->pose_tail, pchan->pose_head, vec);
 }
@@ -2284,7 +2284,7 @@ void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, float cti
 		copy_m4_m3(offs_bone, bone->bone_mat);
 		
 		/* The bone's root offset (is in the parent's coordinate system) */
-		VECCOPY(offs_bone[3], bone->head);
+		copy_v3_v3(offs_bone[3], bone->head);
 		
 		/* Get the length translation of parent (length along y axis) */
 		offs_bone[3][1]+= parbone->length;
@@ -2362,7 +2362,7 @@ void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, float cti
 			bConstraintOb *cob;
 
 			/* make a copy of location of PoseChannel for later */
-			VECCOPY(vec, pchan->pose_mat[3]);
+			copy_v3_v3(vec, pchan->pose_mat[3]);
 
 			/* prepare PoseChannel for Constraint solving
 			 * - makes a copy of matrix, and creates temporary struct to use
@@ -2379,13 +2379,13 @@ void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, float cti
 
 			/* prevent constraints breaking a chain */
 			if(pchan->bone->flag & BONE_CONNECTED) {
-				VECCOPY(pchan->pose_mat[3], vec);
+				copy_v3_v3(pchan->pose_mat[3], vec);
 			}
 		}
 	}
 	
 	/* calculate head */
-	VECCOPY(pchan->pose_head, pchan->pose_mat[3]);
+	copy_v3_v3(pchan->pose_head, pchan->pose_mat[3]);
 	/* calculate tail */
 	where_is_pose_bone_tail(pchan);
 }
@@ -2416,8 +2416,8 @@ void where_is_pose (Scene *scene, Object *ob)
 			bone= pchan->bone;
 			if(bone) {
 				copy_m4_m4(pchan->pose_mat, bone->arm_mat);
-				VECCOPY(pchan->pose_head, bone->arm_head);
-				VECCOPY(pchan->pose_tail, bone->arm_tail);
+				copy_v3_v3(pchan->pose_head, bone->arm_head);
+				copy_v3_v3(pchan->pose_tail, bone->arm_tail);
 			}
 		}
 	}