replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy functions for int & char.

2 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c
index cfaafe9bf5c..787766f0fa6 100644
--- a/source/blender/ikplugin/intern/iksolver_plugin.c
+++ b/source/blender/ikplugin/intern/iksolver_plugin.c
@@ -205,9 +205,9 @@ static void where_is_ik_bone(bPoseChannel *pchan, float ik_mat[][3])   // nr = t
 		mul_m4_m4m4(pchan->pose_mat, ikmat, pchan->chan_mat);
 
 	/* calculate head */
-	VECCOPY(pchan->pose_head, pchan->pose_mat[3]);
+	copy_v3_v3(pchan->pose_head, pchan->pose_mat[3]);
 	/* calculate tail */
-	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);
 
@@ -340,7 +340,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 		copy_m4_m4(rootmat, pchan->parent->pose_mat);
 	else
 		unit_m4(rootmat);
-	VECCOPY(rootmat[3], pchan->pose_head);
+	copy_v3_v3(rootmat[3], pchan->pose_head);
 	
 	mul_m4_m4m4(imat, rootmat, ob->obmat);
 	invert_m4_m4(goalinv, imat);
@@ -359,7 +359,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 		/* and set and transform goal */
 		mul_m4_m4m4(goal, rootmat, goalinv);
 		
-		VECCOPY(goalpos, goal[3]);
+		copy_v3_v3(goalpos, goal[3]);
 		copy_m3_m4(goalrot, goal);
 		
 		/* same for pole vector target */
@@ -372,7 +372,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			}
 			else {
 				mul_m4_m4m4(goal, rootmat, goalinv);
-				VECCOPY(polepos, goal[3]);
+				copy_v3_v3(polepos, goal[3]);
 				poleconstrain= 1;
 
 				/* for pole targets, we blend the result of the ik solver
@@ -398,7 +398,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree)
 			
 			/* end effector in world space */
 			copy_m4_m4(end_pose, pchan->pose_mat);
-			VECCOPY(end_pose[3], pchan->pose_tail);
+			copy_v3_v3(end_pose[3], pchan->pose_tail);
 			mul_serie_m4(world_pose, goalinv, ob->obmat, end_pose, NULL, NULL, NULL, NULL, NULL);
 			
 			/* blend position */
diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp
index 400e720f138..2cb3a32ae3e 100644
--- a/source/blender/ikplugin/intern/itasc_plugin.cpp
+++ b/source/blender/ikplugin/intern/itasc_plugin.cpp
@@ -558,7 +558,7 @@ static bool target_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Fram
 			pchan = pchan->parent;
 			float chanmat[4][4];
 			copy_m4_m4(chanmat, pchan->pose_mat);
-			VECCOPY(chanmat[3], pchan->pose_tail);
+			copy_v3_v3(chanmat[3], pchan->pose_tail);
 			mul_serie_m4(restmat, target->owner->obmat, chanmat, target->eeRest, NULL, NULL, NULL, NULL, NULL);
 		} 
 		else {
@@ -585,7 +585,7 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame&
 		pchan = pchan->parent;
 		float chanmat[4][4];
 		copy_m4_m4(chanmat, pchan->pose_mat);
-		VECCOPY(chanmat[3], pchan->pose_tail);
+		copy_v3_v3(chanmat[3], pchan->pose_tail);
 		// save the base as a frame too so that we can compute deformation
 		// after simulation
 		ikscene->baseFrame.setValue(&chanmat[0][0]);
@@ -1662,12 +1662,12 @@ static void execute_scene(Scene* blscene, IK_Scene* ikscene, bItasc* ikparam, fl
 		pchan = ikchan->pchan;
 		// tail mat
 		ikchan->frame.getValue(&pchan->pose_mat[0][0]);
-		VECCOPY(pchan->pose_tail, pchan->pose_mat[3]);
+		copy_v3_v3(pchan->pose_tail, pchan->pose_mat[3]);
 		// shift to head
-		VECCOPY(yaxis, pchan->pose_mat[1]);
+		copy_v3_v3(yaxis, pchan->pose_mat[1]);
 		mul_v3_fl(yaxis, length);
 		sub_v3_v3v3(pchan->pose_mat[3], pchan->pose_mat[3], yaxis);
-		VECCOPY(pchan->pose_head, pchan->pose_mat[3]);
+		copy_v3_v3(pchan->pose_head, pchan->pose_mat[3]);
 		// add scale
 		mul_v3_fl(pchan->pose_mat[0], scale);
 		mul_v3_fl(pchan->pose_mat[1], scale);