replace VECCOPY and QUATCOPY with inline funcs.

1 files changed, 30 insertions, 30 deletions

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 3f014f241ff..13b1da22449 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1229,7 +1229,7 @@ float *make_orco_curve(Scene *scene, Object *ob)
 					fp[1]= 0.0;
 					fp[2]= 0.0;
 				} else {
-					VECCOPY(fp, &dl->verts[u*3]);
+					copy_v3_v3(fp, &dl->verts[u*3]);
 
 					fp[0]= (fp[0]-cu->loc[0])/cu->size[0];
 					fp[1]= (fp[1]-cu->loc[1])/cu->size[1];
@@ -1258,7 +1258,7 @@ float *make_orco_curve(Scene *scene, Object *ob)
 						int realu= u % dl->parts;
 						
 						vert= dl->verts + 3*(dl->nr*realu + realv);
-						VECCOPY(fp, vert);
+						copy_v3_v3(fp, vert);
 
 						fp[0]= (fp[0]-cu->loc[0])/cu->size[0];
 						fp[1]= (fp[1]-cu->loc[1])/cu->size[1];
@@ -1519,7 +1519,7 @@ static short bevelinside(BevList *bl1,BevList *bl2)
 	hvec1[0]= bevp->vec[0]; 
 	hvec1[1]= bevp->vec[1]; 
 	hvec1[2]= 0.0;
-	VECCOPY(hvec2,hvec1);
+	copy_v3_v3(hvec2,hvec1);
 	hvec2[0]+=1000;
 
 	/* test it with all edges of potential surounding poly */
@@ -1690,15 +1690,15 @@ static void bevel_list_cyclic_fix_3D(BevList *bl)
 
 	bevp= (BevPoint *)(bl+1);
 	bevp1= bevp+1;
-	QUATCOPY(bevp->quat, bevp1->quat);
-	VECCOPY(bevp->dir, bevp1->dir);
-	VECCOPY(bevp->tan, bevp1->tan);
+	copy_qt_qt(bevp->quat, bevp1->quat);
+	copy_v3_v3(bevp->dir, bevp1->dir);
+	copy_v3_v3(bevp->tan, bevp1->tan);
 	bevp= (BevPoint *)(bl+1);
 	bevp+= (bl->nr-1);
 	bevp1= bevp-1;
-	QUATCOPY(bevp->quat, bevp1->quat);
-	VECCOPY(bevp->dir, bevp1->dir);
-	VECCOPY(bevp->tan, bevp1->tan);
+	copy_qt_qt(bevp->quat, bevp1->quat);
+	copy_v3_v3(bevp->dir, bevp1->dir);
+	copy_v3_v3(bevp->tan, bevp1->tan);
 }
 /* utility for make_bevel_list_3D_* funcs */
 static void bevel_list_calc_bisect(BevList *bl)
@@ -1791,7 +1791,7 @@ static void bevel_list_smooth(BevList *bl, int smooth_iter)
 
 		}
 
-		QUATCOPY(bevp0_quat, bevp0->quat);
+		copy_qt_qt(bevp0_quat, bevp0->quat);
 
 		while(nr--) {
 			/* interpolate quats */
@@ -1804,7 +1804,7 @@ static void bevel_list_smooth(BevList *bl, int smooth_iter)
 			axis_angle_to_quat(q2, cross, angle_normalized_v3v3(zaxis, bevp1->dir));
 			normalize_qt(q2);
 
-			QUATCOPY(bevp0_quat, bevp1->quat);
+			copy_qt_qt(bevp0_quat, bevp1->quat);
 			mul_qt_qtqt(q, q2, q);
 			interp_qt_qtqt(bevp1->quat, bevp1->quat, q, 0.5);
 			normalize_qt(bevp1->quat);
@@ -1866,7 +1866,7 @@ static void make_bevel_list_3D_minimum_twist(BevList *bl)
 				mul_qt_qtqt(bevp1->quat, q, bevp0->quat);
 			}
 			else {
-				QUATCOPY(bevp1->quat, bevp0->quat);
+				copy_qt_qt(bevp1->quat, bevp0->quat);
 			}
 		}
 
@@ -1975,7 +1975,7 @@ static void make_bevel_list_3D_tangent(BevList *bl)
 	bevp1= bevp2+(bl->nr-1);
 	bevp0= bevp1-1;
 
-	VECCOPY(bevp0_tan, bevp0->tan);
+	copy_v3_v3(bevp0_tan, bevp0->tan);
 
 	nr= bl->nr;
 	while(nr--) {
@@ -2035,8 +2035,8 @@ static void make_bevel_list_segment_3D(BevList *bl)
 	axis_angle_to_quat(q, bevp1->dir, bevp1->alfa);
 	mul_qt_qtqt(bevp1->quat, q, bevp1->quat);
 	normalize_qt(bevp1->quat);
-	VECCOPY(bevp2->dir, bevp1->dir);
-	QUATCOPY(bevp2->quat, bevp1->quat);
+	copy_v3_v3(bevp2->dir, bevp1->dir);
+	copy_qt_qt(bevp2->quat, bevp1->quat);
 }
 
 
@@ -2106,7 +2106,7 @@ void makeBevelList(Object *ob)
 				bp= nu->bp;
 	
 				while(len--) {
-					VECCOPY(bevp->vec, bp->vec);
+					copy_v3_v3(bevp->vec, bp->vec);
 					bevp->alfa= bp->alfa;
 					bevp->radius= bp->radius;
 					bevp->weight= bp->weight;
@@ -2139,7 +2139,7 @@ void makeBevelList(Object *ob)
 				while(a--) {
 					if(prevbezt->h2==HD_VECT && bezt->h1==HD_VECT) {
 
-						VECCOPY(bevp->vec, prevbezt->vec[1]);
+						copy_v3_v3(bevp->vec, prevbezt->vec[1]);
 						bevp->alfa= prevbezt->alfa;
 						bevp->radius= prevbezt->radius;
 						bevp->weight= prevbezt->weight;
@@ -2191,7 +2191,7 @@ void makeBevelList(Object *ob)
 				}
 				
 				if((nu->flagu & CU_NURB_CYCLIC)==0) {	    /* not cyclic: endpoint */
-					VECCOPY(bevp->vec, prevbezt->vec[1]);
+					copy_v3_v3(bevp->vec, prevbezt->vec[1]);
 					bevp->alfa= prevbezt->alfa;
 					bevp->radius= prevbezt->radius;
 					bevp->weight= prevbezt->weight;
@@ -3011,15 +3011,15 @@ float (*curve_getVertexCos(Curve *UNUSED(cu), ListBase *lb, int *numVerts_r))[3]
 			BezTriple *bezt = nu->bezt;
 
 			for (i=0; i<nu->pntsu; i++,bezt++) {
-				VECCOPY(co, bezt->vec[0]); co+=3;
-				VECCOPY(co, bezt->vec[1]); co+=3;
-				VECCOPY(co, bezt->vec[2]); co+=3;
+				copy_v3_v3(co, bezt->vec[0]); co+=3;
+				copy_v3_v3(co, bezt->vec[1]); co+=3;
+				copy_v3_v3(co, bezt->vec[2]); co+=3;
 			}
 		} else {
 			BPoint *bp = nu->bp;
 
 			for (i=0; i<nu->pntsu*nu->pntsv; i++,bp++) {
-				VECCOPY(co, bp->vec); co+=3;
+				copy_v3_v3(co, bp->vec); co+=3;
 			}
 		}
 	}
@@ -3038,15 +3038,15 @@ void curve_applyVertexCos(Curve *UNUSED(cu), ListBase *lb, float (*vertexCos)[3]
 			BezTriple *bezt = nu->bezt;
 
 			for (i=0; i<nu->pntsu; i++,bezt++) {
-				VECCOPY(bezt->vec[0], co); co+=3;
-				VECCOPY(bezt->vec[1], co); co+=3;
-				VECCOPY(bezt->vec[2], co); co+=3;
+				copy_v3_v3(bezt->vec[0], co); co+=3;
+				copy_v3_v3(bezt->vec[1], co); co+=3;
+				copy_v3_v3(bezt->vec[2], co); co+=3;
 			}
 		} else {
 			BPoint *bp = nu->bp;
 
 			for (i=0; i<nu->pntsu*nu->pntsv; i++,bp++) {
-				VECCOPY(bp->vec, co); co+=3;
+				copy_v3_v3(bp->vec, co); co+=3;
 			}
 		}
 	}
@@ -3064,9 +3064,9 @@ float (*curve_getKeyVertexCos(Curve *UNUSED(cu), ListBase *lb, float *key))[3]
 			BezTriple *bezt = nu->bezt;
 
 			for (i=0; i<nu->pntsu; i++,bezt++) {
-				VECCOPY(co, key); co+=3; key+=3;
-				VECCOPY(co, key); co+=3; key+=3;
-				VECCOPY(co, key); co+=3; key+=3;
+				copy_v3_v3(co, key); co+=3; key+=3;
+				copy_v3_v3(co, key); co+=3; key+=3;
+				copy_v3_v3(co, key); co+=3; key+=3;
 				key+=3; /* skip tilt */
 			}
 		}
@@ -3074,7 +3074,7 @@ float (*curve_getKeyVertexCos(Curve *UNUSED(cu), ListBase *lb, float *key))[3]
 			BPoint *bp = nu->bp;
 
 			for(i=0; i<nu->pntsu*nu->pntsv; i++,bp++) {
-				VECCOPY(co, key); co+=3; key+=3;
+				copy_v3_v3(co, key); co+=3; key+=3;
 				key++; /* skip tilt */
 			}
 		}