more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.

8 files changed, 82 insertions, 82 deletions

diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index 6567cdacf0e..c467c31b5a6 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -135,7 +135,7 @@ void zbufclipwire(struct ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, f
 
 /* exported to shadeinput.c */
 void zbuf_make_winmat(Render *re, float winmat[][4]);
-void zbuf_render_project(float winmat[][4], float *co, float *ho);
+void zbuf_render_project(float winmat[][4], const float co[3], float ho[4]);
 
 #endif
 
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 719b9674b80..1887f22198d 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -88,7 +88,7 @@ static void ibuf_get_color(float *col, struct ImBuf *ibuf, int x, int y)
 	if(ibuf->rect_float) {
 		if(ibuf->channels==4) {
 			float *fp= ibuf->rect_float + 4*ofs;
-			QUATCOPY(col, fp);
+			copy_v4_v4(col, fp);
 		}
 		else if(ibuf->channels==3) {
 			float *fp= ibuf->rect_float + 3*ofs;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index a02c5681e5e..1a58a665e0a 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -1593,7 +1593,7 @@ void ray_trace(ShadeInput *shi, ShadeResult *shr)
 	}
 	/* put back together */
 	if(shi->combinedflag & SCE_PASS_SPEC)
-		VECADD(shr->combined, diff, shr->spec) /* no ; */
+		add_v3_v3v3(shr->combined, diff, shr->spec);
 	else
 		copy_v3_v3(shr->combined, diff);
 }
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index d2683f26c3a..48134c46c61 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -562,7 +562,7 @@ static void add_passes(RenderLayer *rl, int offset, ShadeInput *shi, ShadeResult
 	float *fp;
 	
 	fp= rl->rectf + 4*offset;
-	QUATCOPY(fp, shr->combined);
+	copy_v4_v4(fp, shr->combined);
 	
 	for(rpass= rl->passes.first; rpass; rpass= rpass->next) {
 		float *col= NULL, uvcol[3];
@@ -695,7 +695,7 @@ static void sky_tile(RenderPart *pa, RenderLayer *rl)
 					}
 					
 					if(pass[3]==0.0f) {
-						QUATCOPY(pass, col);
+						copy_v4_v4(pass, col);
 					}
 					else {
 						addAlphaUnderFloat(pass, col);
@@ -2345,7 +2345,7 @@ static void do_bake_shade(void *handle, int x, int y, float u, float v)
 	if(bs->type==RE_BAKE_NORMALS && R.r.bake_normal_space==R_BAKE_SPACE_TANGENT) {
 		shade_input_set_shade_texco(shi);
 		VECCOPY(tvn, shi->nmapnorm);
-		QUATCOPY(ttang, shi->nmaptang);
+		copy_v4_v4(ttang, shi->nmaptang);
 	}
 
 	/* if we are doing selected to active baking, find point on other face */
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index ddfe3199d30..0ed3a094cf8 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -495,10 +495,10 @@ static float area_lamp_energy_multisample(LampRen *lar, float *co, float *vn)
 		vec[2]= 0.0f;
 		mul_m3_v3(lar->mat, vec);
 		
-		VECADD(area[0], lar->area[0], vec);
-		VECADD(area[1], lar->area[1], vec);
-		VECADD(area[2], lar->area[2], vec);
-		VECADD(area[3], lar->area[3], vec);
+		add_v3_v3v3(area[0], lar->area[0], vec);
+		add_v3_v3v3(area[1], lar->area[1], vec);
+		add_v3_v3v3(area[2], lar->area[2], vec);
+		add_v3_v3v3(area[3], lar->area[3], vec);
 		
 		intens+= area_lamp_energy(area, co, vn);
 		
@@ -1111,12 +1111,12 @@ void lamp_get_shadow(LampRen *lar, ShadeInput *shi, float inp, float shadfac[4],
 		}
 		
 		if(shi->depth==0) {
-			QUATCOPY(lss->shadfac, shadfac);
+			copy_v4_v4(lss->shadfac, shadfac);
 			lss->samplenr= shi->samplenr;
 		}
 	}
 	else {
-		QUATCOPY(shadfac, lss->shadfac);
+		copy_v4_v4(shadfac, lss->shadfac);
 	}
 }
 
@@ -1879,16 +1879,16 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
 	
 	/* and add emit and spec */
 	if(shi->combinedflag & SCE_PASS_EMIT)
-		VECADD(shr->combined, shr->combined, shr->emit);
+		add_v3_v3(shr->combined, shr->emit);
 	if(shi->combinedflag & SCE_PASS_SPEC)
-		VECADD(shr->combined, shr->combined, shr->spec);
+		add_v3_v3(shr->combined, shr->spec);
 	
 	/* modulate by the object color */
 	if((ma->shade_flag & MA_OBCOLOR) && shi->obr->ob) {
 		if(!(ma->sss_flag & MA_DIFF_SSS) || !sss_pass_done(&R, ma)) {
 			float obcol[4];
 
-			QUATCOPY(obcol, shi->obr->ob->col);
+			copy_v4_v4(obcol, shi->obr->ob->col);
 			CLAMP(obcol[3], 0.0f, 1.0f);
 
 			shr->combined[0] *= obcol[0];
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c
index cf97a63d8a0..4192aaf42aa 100644
--- a/source/blender/render/intern/source/sss.c
+++ b/source/blender/render/intern/source/sss.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -452,11 +452,11 @@ static void compute_radiance(ScatterTree *tree, float *co, float *rad)
 	mul_v3_fl(result.rad, tree->ss[0]->frontweight);
 	mul_v3_fl(result.backrad, tree->ss[0]->backweight);
 
-	VECCOPY(rad, result.rad);
-	VECADD(backrad, result.rad, result.backrad);
+	copy_v3_v3(rad, result.rad);
+	add_v3_v3v3(backrad, result.rad, result.backrad);
 
-	VECCOPY(rdsum, result.rdsum);
-	VECADD(backrdsum, result.rdsum, result.backrdsum);
+	copy_v3_v3(rdsum, result.rdsum);
+	add_v3_v3v3(backrdsum, result.rdsum, result.backrdsum);
 
 	if(rdsum[0] > 1e-16f) rad[0]= tree->ss[0]->color*rad[0]/rdsum[0];
 	if(rdsum[1] > 1e-16f) rad[1]= tree->ss[1]->color*rad[1]/rdsum[1];
@@ -761,8 +761,8 @@ ScatterTree *scatter_tree_new(ScatterSettings *ss[3], float scale, float error,
 	INIT_MINMAX(tree->min, tree->max);
 
 	for(i=0; i<totpoint; i++) {
-		VECCOPY(points[i].co, co[i]);
-		VECCOPY(points[i].rad, color[i]);
+		copy_v3_v3(points[i].co, co[i]);
+		copy_v3_v3(points[i].rad, color[i]);
 		points[i].area= fabsf(area[i])/(tree->scale*tree->scale);
 		points[i].back= (area[i] < 0.0f);
 
@@ -818,7 +818,7 @@ void scatter_tree_sample(ScatterTree *tree, float *co, float *color)
 {
 	float sco[3];
 
-	VECCOPY(sco, co);
+	copy_v3_v3(sco, co);
 	mul_v3_fl(sco, 1.0f/tree->scale);
 
 	compute_radiance(tree, sco, color);
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index ed12c08c193..ddcffcc303b 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -98,10 +98,10 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 	t= spoint->t;
 	type= (strandbuf->flag & R_STRAND_BSPLINE)? KEY_BSPLINE: KEY_CARDINAL;
 
-	VECCOPY(p[0], sseg->v[0]->co);
-	VECCOPY(p[1], sseg->v[1]->co);
-	VECCOPY(p[2], sseg->v[2]->co);
-	VECCOPY(p[3], sseg->v[3]->co);
+	copy_v3_v3(p[0], sseg->v[0]->co);
+	copy_v3_v3(p[1], sseg->v[1]->co);
+	copy_v3_v3(p[2], sseg->v[2]->co);
+	copy_v3_v3(p[3], sseg->v[3]->co);
 
 	if(sseg->obi->flag & R_TRANSFORMED) {
 		mul_m4_v3(sseg->obi->mat, p[0]);
@@ -111,7 +111,7 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 	}
 
 	if(t == 0.0f) {
-		VECCOPY(spoint->co, p[1]);
+		copy_v3_v3(spoint->co, p[1]);
 		spoint->strandco= sseg->v[1]->strandco;
 
 		spoint->dtstrandco= (sseg->v[2]->strandco - sseg->v[0]->strandco);
@@ -119,7 +119,7 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 			spoint->dtstrandco *= 0.5f;
 	}
 	else if(t == 1.0f) {
-		VECCOPY(spoint->co, p[2]);
+		copy_v3_v3(spoint->co, p[2]);
 		spoint->strandco= sseg->v[2]->strandco;
 
 		spoint->dtstrandco= (sseg->v[3]->strandco - sseg->v[1]->strandco);
@@ -139,10 +139,10 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 	spoint->dtco[1]= data[0]*p[0][1] + data[1]*p[1][1] + data[2]*p[2][1] + data[3]*p[3][1];
 	spoint->dtco[2]= data[0]*p[0][2] + data[1]*p[1][2] + data[2]*p[2][2] + data[3]*p[3][2];
 
-	VECCOPY(spoint->tan, spoint->dtco);
+	copy_v3_v3(spoint->tan, spoint->dtco);
 	normalize_v3(spoint->tan);
 
-	VECCOPY(spoint->nor, spoint->co);
+	copy_v3_v3(spoint->nor, spoint->co);
 	VECMUL(spoint->nor, -1.0f);
 	normalize_v3(spoint->nor);
 
@@ -183,7 +183,7 @@ void strand_eval_point(StrandSegment *sseg, StrandPoint *spoint)
 	sub_v3_v3v3(spoint->co1, spoint->co, cross);
 	add_v3_v3v3(spoint->co2, spoint->co, cross);
 
-	VECCOPY(spoint->dsco, cross);
+	copy_v3_v3(spoint->dsco, cross);
 }
 
 /* *************** */
@@ -617,10 +617,10 @@ static void do_scanconvert_strand(Render *UNUSED(re), StrandPart *spart, ZSpan *
 {
 	float jco1[3], jco2[3], jco3[3], jco4[3], jx, jy;
 
-	VECCOPY(jco1, co1);
-	VECCOPY(jco2, co2);
-	VECCOPY(jco3, co3);
-	VECCOPY(jco4, co4);
+	copy_v3_v3(jco1, co1);
+	copy_v3_v3(jco2, co2);
+	copy_v3_v3(jco3, co3);
+	copy_v3_v3(jco4, co4);
 
 	if(spart->jit) {
 		jx= -spart->jit[sample][0];
@@ -1008,7 +1008,7 @@ StrandSurface *cache_strand_surface(Render *re, ObjectRen *obr, DerivedMesh *dm,
 
 	mvert= dm->getVertArray(dm);
 	for(a=0; a<mesh->totvert; a++, mvert++) {
-		VECCOPY(co[a], mvert->co);
+		copy_v3_v3(co[a], mvert->co);
 		mul_m4_v3(mat, co[a]);
 	}
 
@@ -1047,7 +1047,7 @@ void strand_minmax(StrandRen *strand, float *min, float *max, float width)
 	int a;
 
 	for(a=0, svert=strand->vert; a<strand->totvert; a++, svert++) {
-		VECCOPY(vec, svert->co);
+		copy_v3_v3(vec, svert->co);
 		DO_MINMAX(vec, min, max);
 		
 		if(width!=0.0f) {
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 7a8779ee969..8b383992e65 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -444,12 +444,12 @@ static void zbuflineAc(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec
 
 		/* all lines from left to right */
 		if(vec1[0]<vec2[0]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 
@@ -512,12 +512,12 @@ static void zbuflineAc(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec
 	
 		/* all lines from top to bottom */
 		if(vec1[1]<vec2[1]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 
@@ -598,12 +598,12 @@ static void zbufline(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec2)
 
 		/* all lines from left to right */
 		if(vec1[0]<vec2[0]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 
@@ -656,12 +656,12 @@ static void zbufline(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec2)
 	else {
 		/* all lines from top to bottom */
 		if(vec1[1]<vec2[1]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 
@@ -728,12 +728,12 @@ static void zbufline_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr), flo
 		
 		/* all lines from left to right */
 		if(vec1[0]<vec2[0]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 		
@@ -784,12 +784,12 @@ static void zbufline_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr), flo
 	else {
 		/* all lines from top to bottom */
 		if(vec1[1]<vec2[1]) {
-			VECCOPY(v1, vec1);
-			VECCOPY(v2, vec2);
+			copy_v3_v3(v1, vec1);
+			copy_v3_v3(v2, vec2);
 		}
 		else {
-			VECCOPY(v2, vec1);
-			VECCOPY(v1, vec2);
+			copy_v3_v3(v2, vec1);
+			copy_v3_v3(v1, vec2);
 			dx= -dx; dy= -dy;
 		}
 		
@@ -925,8 +925,8 @@ void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *h
 		else {	/* clipping */
 
 			if(ec & ME_V1V2) {
-				QUATCOPY(vez, ho1);
-				QUATCOPY(vez+4, ho2);
+				copy_v4_v4(vez, ho1);
+				copy_v4_v4(vez+4, ho2);
 				if( clipline(vez, vez+4)) {
 					hoco_to_zco(zspan, vez, vez);
 					hoco_to_zco(zspan, vez+4, vez+4);
@@ -934,8 +934,8 @@ void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *h
 				}
 			}
 			if(ec & ME_V2V3) {
-				QUATCOPY(vez, ho2);
-				QUATCOPY(vez+4, ho3);
+				copy_v4_v4(vez, ho2);
+				copy_v4_v4(vez+4, ho3);
 				if( clipline(vez, vez+4)) {
 					hoco_to_zco(zspan, vez, vez);
 					hoco_to_zco(zspan, vez+4, vez+4);
@@ -944,8 +944,8 @@ void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *h
 			}
 			if(ho4) {
 				if(ec & ME_V3V4) {
-					QUATCOPY(vez, ho3);
-					QUATCOPY(vez+4, ho4);
+					copy_v4_v4(vez, ho3);
+					copy_v4_v4(vez+4, ho4);
 					if( clipline(vez, vez+4)) {
 						hoco_to_zco(zspan, vez, vez);
 						hoco_to_zco(zspan, vez+4, vez+4);
@@ -953,8 +953,8 @@ void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *h
 					}
 				}
 				if(ec & ME_V4V1) {
-					QUATCOPY(vez, ho4);
-					QUATCOPY(vez+4, ho1);
+					copy_v4_v4(vez, ho4);
+					copy_v4_v4(vez+4, ho1);
 					if( clipline(vez, vez+4)) {
 						hoco_to_zco(zspan, vez, vez);
 						hoco_to_zco(zspan, vez+4, vez+4);
@@ -964,8 +964,8 @@ void zbufclipwire(ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *h
 			}
 			else {
 				if(ec & ME_V3V1) {
-					QUATCOPY(vez, ho3);
-					QUATCOPY(vez+4, ho1);
+					copy_v4_v4(vez, ho3);
+					copy_v4_v4(vez+4, ho1);
 					if( clipline(vez, vez+4)) {
 						hoco_to_zco(zspan, vez, vez);
 						hoco_to_zco(zspan, vez+4, vez+4);
@@ -1748,7 +1748,7 @@ static int zbuf_shadow_project(ZbufProjectCache *cache, int index, float winmat[
 	int cindex= index & 255;
 
 	if(cache[cindex].index == index) {
-		QUATCOPY(ho, cache[cindex].ho);
+		copy_v4_v4(ho, cache[cindex].ho);
 		return cache[cindex].clip;
 	}
 	else {
@@ -1756,7 +1756,7 @@ static int zbuf_shadow_project(ZbufProjectCache *cache, int index, float winmat[
 		projectvert(co, winmat, ho);
 		clipflag= testclip(ho);
 
-		QUATCOPY(cache[cindex].ho, ho);
+		copy_v4_v4(cache[cindex].ho, ho);
 		cache[cindex].clip= clipflag;
 		cache[cindex].index= index;
 
@@ -1778,13 +1778,13 @@ static int zbuf_part_project(ZbufProjectCache *cache, int index, float winmat[][
 	int cindex= index & 255;
 
 	if(cache[cindex].index == index) {
-		QUATCOPY(ho, cache[cindex].ho);
+		copy_v4_v4(ho, cache[cindex].ho);
 		return cache[cindex].clip;
 	}
 	else {
 		float wco;
 		int clipflag= 0;
-		VECCOPY(vec, co)
+		copy_v3_v3(vec, co);
 		projectvert(co, winmat, ho);
 
 		wco= ho[3];
@@ -1793,7 +1793,7 @@ static int zbuf_part_project(ZbufProjectCache *cache, int index, float winmat[][
 		if(ho[1] > bounds[3]*wco) clipflag |= 4;
 		else if(ho[1] < bounds[2]*wco) clipflag |= 8;
 
-		QUATCOPY(cache[cindex].ho, ho);
+		copy_v4_v4(cache[cindex].ho, ho);
 		cache[cindex].clip= clipflag;
 		cache[cindex].index= index;
 
@@ -1801,11 +1801,11 @@ static int zbuf_part_project(ZbufProjectCache *cache, int index, float winmat[][
 	}
 }
 
-void zbuf_render_project(float winmat[][4], float *co, float *ho)
+void zbuf_render_project(float winmat[][4], const float co[3], float ho[4])
 {
 	float vec[3];
 
-	VECCOPY(vec, co)
+	copy_v3_v3(vec, co);
 	projectvert(vec, winmat, ho);
 }
 
@@ -3348,7 +3348,7 @@ static int zbuffer_abuf(Render *re, RenderPart *pa, APixstr *APixbuf, ListBase *
 							mul= 0x7FFFFFFF;
 							zval= mul*(1.0f+ho1[2]/ho1[3]);
 
-							VECCOPY(vec, v1->co);
+							copy_v3_v3(vec, v1->co);
 							/* z is negative, otherwise its being clipped */ 
 							vec[2]-= ma->zoffs;
 							projectverto(vec, obwinmat, hoco);
@@ -3474,7 +3474,7 @@ void add_transp_speed(RenderLayer *rl, int offset, float *speed, float alpha, in
 				if(fp[3]==PASS_VECTOR_MAX) fp[3]= 0.0f;
 			}
 			else if(rdrect==NULL || rdrect[offset]==0 || alpha>0.95f) {
-				QUATCOPY(fp, speed);
+				copy_v4_v4(fp, speed);
 			}
 			else {
 				/* add minimum speed in pixel */
@@ -3866,7 +3866,7 @@ static int addtosamp_shr(ShadeResult *samp_shr, ShadeSample *ssamp, int addpassf
 				samp_shr->z= MIN2(samp_shr->z, shr->z);
 
 				if(addpassflag & SCE_PASS_VECTOR) {
-					QUATCOPY(samp_shr->winspeed, shr->winspeed);
+					copy_v4_v4(samp_shr->winspeed, shr->winspeed);
 				}
 				/* optim... */
 				if(addpassflag & ~(SCE_PASS_VECTOR)) {