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

3 files changed, 54 insertions, 56 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 25f9f17f201..d2c86a14572 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -152,7 +152,7 @@ static void cdDM_getVertCo(DerivedMesh *dm, int index, float co_r[3])
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
 
-	VECCOPY(co_r, cddm->mvert[index].co);
+	copy_v3_v3(co_r, cddm->mvert[index].co);
 }
 
 static void cdDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
@@ -161,7 +161,7 @@ static void cdDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
 	int i;
 
 	for(i = 0; i < dm->numVertData; i++, mv++)
-		VECCOPY(cos_r[i], mv->co);
+		copy_v3_v3(cos_r[i], mv->co);
 }
 
 static void cdDM_getVertNo(DerivedMesh *dm, int index, float no_r[3])
@@ -1246,39 +1246,39 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo
 				if( numdata != 0 ) {
 					offset = 0;
 					if(attribs.totorco) {
-						VECCOPY((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
-						VECCOPY((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v2]);
-						VECCOPY((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v3]);
+						copy_v3_v3((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
+						copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v2]);
+						copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v3]);
 						offset += sizeof(float)*3;
 					}
 					for(b = 0; b < attribs.tottface; b++) {
 						MTFace *tf = &attribs.tface[b].array[a];
-						VECCOPY2D((float *)&varray[elementsize*curface*3+offset],tf->uv[0]);
-						VECCOPY2D((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
+						copy_v2_v2((float *)&varray[elementsize*curface*3+offset],tf->uv[0]);
+						copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
 
-						VECCOPY2D((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
+						copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
 						offset += sizeof(float)*2;
 					}
 					for(b = 0; b < attribs.totmcol; b++) {
 						MCol *cp = &attribs.mcol[b].array[a*4 + 0];
 						GLubyte col[4];
 						col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-						QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset], col);
+						copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset], (char *)col);
 						cp = &attribs.mcol[b].array[a*4 + 1];
 						col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-						QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset+elementsize], col);
+						copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
 						cp = &attribs.mcol[b].array[a*4 + 2];
 						col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-						QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset+elementsize*2], col);
+						copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
 						offset += sizeof(unsigned char)*4;
 					}	
 					if(attribs.tottang) {
 						float *tang = attribs.tang.array[a*4 + 0];
-						QUATCOPY((float *)&varray[elementsize*curface*3+offset], tang);
+						copy_v4_v4((float *)&varray[elementsize*curface*3+offset], tang);
 						tang = attribs.tang.array[a*4 + 1];
-						QUATCOPY((float *)&varray[elementsize*curface*3+offset+elementsize], tang);
+						copy_v4_v4((float *)&varray[elementsize*curface*3+offset+elementsize], tang);
 						tang = attribs.tang.array[a*4 + 2];
-						QUATCOPY((float *)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+						copy_v4_v4((float *)&varray[elementsize*curface*3+offset+elementsize*2], tang);
 						offset += sizeof(float)*4;
 					}
 					(void)offset;
@@ -1288,38 +1288,38 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo
 					if( numdata != 0 ) {
 						offset = 0;
 						if(attribs.totorco) {
-							VECCOPY((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
-							VECCOPY((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v4]);
-							VECCOPY((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v1]);
+							copy_v3_v3((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
+							copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v4]);
+							copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v1]);
 							offset += sizeof(float)*3;
 						}
 						for(b = 0; b < attribs.tottface; b++) {
 							MTFace *tf = &attribs.tface[b].array[a];
-							VECCOPY2D((float *)&varray[elementsize*curface*3+offset],tf->uv[2]);
-							VECCOPY2D((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
-							VECCOPY2D((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
+							copy_v2_v2((float *)&varray[elementsize*curface*3+offset],tf->uv[2]);
+							copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
+							copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
 							offset += sizeof(float)*2;
 						}
 						for(b = 0; b < attribs.totmcol; b++) {
 							MCol *cp = &attribs.mcol[b].array[a*4 + 2];
 							GLubyte col[4];
 							col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-							QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset], col);
+							copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset], (char *)col);
 							cp = &attribs.mcol[b].array[a*4 + 3];
 							col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-							QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset+elementsize], col);
+							copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
 							cp = &attribs.mcol[b].array[a*4 + 0];
 							col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
-							QUATCOPY((unsigned char *)&varray[elementsize*curface*3+offset+elementsize*2], col);
+							copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
 							offset += sizeof(unsigned char)*4;
 						}	
 						if(attribs.tottang) {
 							float *tang = attribs.tang.array[a*4 + 2];
-							QUATCOPY((float *)&varray[elementsize*curface*3+offset], tang);
+							copy_v4_v4((float *)&varray[elementsize*curface*3+offset], tang);
 							tang = attribs.tang.array[a*4 + 3];
-							QUATCOPY((float *)&varray[elementsize*curface*3+offset+elementsize], tang);
+							copy_v4_v4((float *)&varray[elementsize*curface*3+offset+elementsize], tang);
 							tang = attribs.tang.array[a*4 + 0];
-							QUATCOPY((float *)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+							copy_v4_v4((float *)&varray[elementsize*curface*3+offset+elementsize*2], tang);
 							offset += sizeof(float)*4;
 						}
 						(void)offset;
@@ -1439,7 +1439,7 @@ static void cdDM_foreachMappedFaceCenter(
 		else
 			orig = i;
 
-		VECCOPY(cent, mv[mf->v1].co);
+		copy_v3_v3(cent, mv[mf->v1].co);
 		add_v3_v3(cent, mv[mf->v2].co);
 		add_v3_v3(cent, mv[mf->v3].co);
 
@@ -1625,7 +1625,7 @@ DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
 		i++, eve = eve->next, index++) {
 		MVert *mv = &mvert[i];
 
-		VECCOPY(mv->co, eve->co);
+		copy_v3_v3(mv->co, eve->co);
 
 		normal_float_to_short_v3(mv->no, eve->no);
 		mv->bweight = (unsigned char) (eve->bweight * 255.0f);
@@ -1793,7 +1793,7 @@ void CDDM_apply_vert_coords(DerivedMesh *dm, float (*vertCoords)[3])
 	cddm->mvert = vert;
 
 	for(i = 0; i < dm->numVertData; ++i, ++vert)
-		VECCOPY(vert->co, vertCoords[i]);
+		copy_v3_v3(vert->co, vertCoords[i]);
 }
 
 void CDDM_apply_vert_normals(DerivedMesh *dm, short (*vertNormals)[3])
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index ba5b98ee3cd..9deaa19429f 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -183,8 +183,8 @@ static void ptcache_softbody_interpolate(int index, void *soft_v, void **data, f
 	if(cfra1 == cfra2)
 		return;
 
-	VECCOPY(keys[1].co, bp->pos);
-	VECCOPY(keys[1].vel, bp->vec);
+	copy_v3_v3(keys[1].co, bp->pos);
+	copy_v3_v3(keys[1].vel, bp->vec);
 
 	if(old_data) {
 		memcpy(keys[2].co, old_data, 3 * sizeof(float));
@@ -202,8 +202,8 @@ static void ptcache_softbody_interpolate(int index, void *soft_v, void **data, f
 
 	mul_v3_fl(keys->vel, 1.0f / dfra);
 
-	VECCOPY(bp->pos, keys->co);
-	VECCOPY(bp->vec, keys->vel);
+	copy_v3_v3(bp->pos, keys->co);
+	copy_v3_v3(bp->vec, keys->vel);
 }
 static int  ptcache_softbody_totpoint(void *soft_v, int UNUSED(cfra))
 {
@@ -483,8 +483,8 @@ static void ptcache_cloth_interpolate(int index, void *cloth_v, void **data, flo
 	if(cfra1 == cfra2)
 		return;
 
-	VECCOPY(keys[1].co, vert->x);
-	VECCOPY(keys[1].vel, vert->v);
+	copy_v3_v3(keys[1].co, vert->x);
+	copy_v3_v3(keys[1].vel, vert->v);
 
 	if(old_data) {
 		memcpy(keys[2].co, old_data, 3 * sizeof(float));
@@ -502,8 +502,8 @@ static void ptcache_cloth_interpolate(int index, void *cloth_v, void **data, flo
 
 	mul_v3_fl(keys->vel, 1.0f / dfra);
 
-	VECCOPY(vert->x, keys->co);
-	VECCOPY(vert->v, keys->vel);
+	copy_v3_v3(vert->x, keys->co);
+	copy_v3_v3(vert->v, keys->vel);
 
 	/* should vert->xconst be interpolated somehow too? - jahka */
 }
@@ -2126,7 +2126,7 @@ int  BKE_ptcache_id_exist(PTCacheID *pid, int cfra)
 }
 void BKE_ptcache_id_time(PTCacheID *pid, Scene *scene, float cfra, int *startframe, int *endframe, float *timescale)
 {
-	Object *ob;
+	/* Object *ob; */ /* UNUSED */
 	PointCache *cache;
 	/* float offset; unused for now */
 	float time, nexttime;
@@ -2143,7 +2143,7 @@ void BKE_ptcache_id_time(PTCacheID *pid, Scene *scene, float cfra, int *startfra
 	 *   is probably to interpolate results from two frames for that ..
 	 */
 
-	ob= pid->ob;
+	/* ob= pid->ob; */ /* UNUSED */
 	cache= pid->cache;
 
 	if(timescale) {
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 3d788b40a17..aed246690bd 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -167,13 +167,11 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
 
 
 		//Convert the vertex to tree coordinates
-		if(calc->vert)
-		{
-			VECCOPY(tmp_co, calc->vert[i].co);
+		if(calc->vert) {
+			copy_v3_v3(tmp_co, calc->vert[i].co);
 		}
-		else
-		{
-			VECCOPY(tmp_co, co);
+		else {
+			copy_v3_v3(tmp_co, co);
 		}
 		space_transform_apply(&calc->local2target, tmp_co);
 
@@ -198,7 +196,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
 			if(dist > FLT_EPSILON) weight *= (dist - calc->keepDist)/dist;
 
 			//Convert the coordinates back to mesh coordinates
-			VECCOPY(tmp_co, nearest.co);
+			copy_v3_v3(tmp_co, nearest.co);
 			space_transform_invert(&calc->local2target, tmp_co);
 
 			interp_v3_v3v3(co, co, tmp_co, weight);	//linear interpolation
@@ -228,11 +226,11 @@ int normal_projection_project_vertex(char options, const float *vert, const floa
 	//Apply space transform (TODO readjust dist)
 	if(transf)
 	{
-		VECCOPY( tmp_co, vert );
+		copy_v3_v3( tmp_co, vert );
 		space_transform_apply( transf, tmp_co );
 		co = tmp_co;
 
-		VECCOPY( tmp_no, dir );
+		copy_v3_v3( tmp_no, dir );
 		space_transform_apply_normal( transf, tmp_no );
 		no = tmp_no;
 
@@ -350,17 +348,17 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc)
 				/* this coordinated are deformed by vertexCos only for normal projection (to get correct normals) */
 				/* for other cases calc->varts contains undeformed coordinates and vertexCos should be used */
 				if(calc->smd->projAxis == MOD_SHRINKWRAP_PROJECT_OVER_NORMAL) {
-					VECCOPY(tmp_co, calc->vert[i].co);
+					copy_v3_v3(tmp_co, calc->vert[i].co);
 					normal_short_to_float_v3(tmp_no, calc->vert[i].no);
 				} else {
-					VECCOPY(tmp_co, co);
-					VECCOPY(tmp_no, proj_axis);
+					copy_v3_v3(tmp_co, co);
+					copy_v3_v3(tmp_no, proj_axis);
 				}
 			}
 			else
 			{
-				VECCOPY(tmp_co, co);
-				VECCOPY(tmp_no, proj_axis);
+				copy_v3_v3(tmp_co, co);
+				copy_v3_v3(tmp_no, proj_axis);
 			}
 
 
@@ -443,11 +441,11 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
 		//Convert the vertex to tree coordinates
 		if(calc->vert)
 		{
-			VECCOPY(tmp_co, calc->vert[i].co);
+			copy_v3_v3(tmp_co, calc->vert[i].co);
 		}
 		else
 		{
-			VECCOPY(tmp_co, co);
+			copy_v3_v3(tmp_co, co);
 		}
 		space_transform_apply(&calc->local2target, tmp_co);
 
@@ -478,7 +476,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
 				if(dist > FLT_EPSILON)
 					interp_v3_v3v3(tmp_co, tmp_co, nearest.co, (dist - calc->keepDist)/dist);	//linear interpolation
 				else
-					VECCOPY( tmp_co, nearest.co );
+					copy_v3_v3( tmp_co, nearest.co );
 			}
 
 			//Convert the coordinates back to mesh coordinates