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

1 files changed, 21 insertions, 21 deletions

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index f92fb4444cc..3e88fb7d65e 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -815,7 +815,7 @@ static void distribute_threads_exec(ParticleThread *thread, ParticleData *pa, Ch
 			normalize_v3(nor);
 			mul_v3_fl(nor,-100.0);
 
-			VECADD(co2,co1,nor);
+			add_v3_v3v3(co2,co1,nor);
 
 			min_d=2.0;
 			intersect=0;
@@ -1099,11 +1099,11 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
 
 			for(p=0; p<totvert; p++) {
 				if(orcodata) {
-					VECCOPY(co,orcodata[p])
+					copy_v3_v3(co,orcodata[p]);
 					transform_mesh_orco_verts((Mesh*)ob->data, &co, 1, 1);
 				}
 				else
-					VECCOPY(co,mv[p].co)
+					copy_v3_v3(co,mv[p].co);
 				BLI_kdtree_insert(tree,p,co,NULL);
 			}
 
@@ -1141,14 +1141,14 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
 			MFace *mf=dm->getFaceData(dm,i,CD_MFACE);
 
 			if(orcodata) {
-				VECCOPY(co1, orcodata[mf->v1]);
-				VECCOPY(co2, orcodata[mf->v2]);
-				VECCOPY(co3, orcodata[mf->v3]);
+				copy_v3_v3(co1, orcodata[mf->v1]);
+				copy_v3_v3(co2, orcodata[mf->v2]);
+				copy_v3_v3(co3, orcodata[mf->v3]);
 				transform_mesh_orco_verts((Mesh*)ob->data, &co1, 1, 1);
 				transform_mesh_orco_verts((Mesh*)ob->data, &co2, 1, 1);
 				transform_mesh_orco_verts((Mesh*)ob->data, &co3, 1, 1);
 				if(mf->v4) {
-					VECCOPY(co4, orcodata[mf->v4]);
+					copy_v3_v3(co4, orcodata[mf->v4]);
 					transform_mesh_orco_verts((Mesh*)ob->data, &co4, 1, 1);
 				}
 			}
@@ -1156,12 +1156,12 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
 				v1= (MVert*)dm->getVertData(dm,mf->v1,CD_MVERT);
 				v2= (MVert*)dm->getVertData(dm,mf->v2,CD_MVERT);
 				v3= (MVert*)dm->getVertData(dm,mf->v3,CD_MVERT);
-				VECCOPY(co1, v1->co);
-				VECCOPY(co2, v2->co);
-				VECCOPY(co3, v3->co);
+				copy_v3_v3(co1, v1->co);
+				copy_v3_v3(co2, v2->co);
+				copy_v3_v3(co3, v3->co);
 				if(mf->v4) {
 					v4= (MVert*)dm->getVertData(dm,mf->v4,CD_MVERT);
-					VECCOPY(co4, v4->co);
+					copy_v3_v3(co4, v4->co);
 				}
 			}
 
@@ -1648,7 +1648,7 @@ void psys_get_birth_coordinates(ParticleSimulationData *sim, ParticleData *pa, P
 			normalize_v3(state->ave);
 		}
 		else {
-			VECCOPY(state->ave, nor);
+			copy_v3_v3(state->ave, nor);
 		}
 
 		/* calculate rotation matrix */
@@ -2423,7 +2423,7 @@ static void sph_force_cb(void *sphdata_v, ParticleKey *state, float *force, floa
 		pfr.element_size = MAXFLOAT;
 	}
 	sphdata->element_size = pfr.element_size;
-	VECCOPY(sphdata->flow, pfr.flow);
+	copy_v3_v3(sphdata->flow, pfr.flow);
 
 	pressure =  stiffness * (pfr.density - rest_density);
 	near_pressure = stiffness_near_fac * pfr.near_density;
@@ -2520,7 +2520,7 @@ static void sph_integrate(ParticleSimulationData *sim, ParticleData *pa, float d
 
 	integrate_particle(part, pa, dtime, effector_acceleration, sph_force_cb, &sphdata);
 	*element_size = sphdata.element_size;
-	VECCOPY(flow, sphdata.flow);
+	copy_v3_v3(flow, sphdata.flow);
 }
 
 /************************************************/
@@ -2592,19 +2592,19 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa
 	if(part->dampfac != 0.f)
 		mul_v3_fl(pa->state.vel, 1.f - part->dampfac * efdata.ptex.damp * 25.f * dtime);
 
-	//VECCOPY(pa->state.ave, states->ave);
+	//copy_v3_v3(pa->state.ave, states->ave);
 
 	/* finally we do guides */
 	time=(cfra-pa->time)/pa->lifetime;
 	CLAMP(time, 0.0f, 1.0f);
 
-	VECCOPY(tkey.co,pa->state.co);
-	VECCOPY(tkey.vel,pa->state.vel);
+	copy_v3_v3(tkey.co,pa->state.co);
+	copy_v3_v3(tkey.vel,pa->state.vel);
 	tkey.time=pa->state.time;
 
 	if(part->type != PART_HAIR) {
 		if(do_guides(sim->psys->effectors, &tkey, p, time)) {
-			VECCOPY(pa->state.co,tkey.co);
+			copy_v3_v3(pa->state.co,tkey.co);
 			/* guides don't produce valid velocity */
 			sub_v3_v3v3(pa->state.vel, tkey.co, pa->prev_state.co);
 			mul_v3_fl(pa->state.vel,1.0f/dtime);
@@ -3472,8 +3472,8 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
 			if(k==0) {
 				float temp[3];
 				sub_v3_v3v3(temp, key->co, (key+1)->co);
-				VECCOPY(mvert->co, key->co);
-				VECADD(mvert->co, mvert->co, temp);
+				copy_v3_v3(mvert->co, key->co);
+				add_v3_v3v3(mvert->co, mvert->co, temp);
 				mul_m4_v3(hairmat, mvert->co);
 				mvert++;
 
@@ -3492,7 +3492,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
 				}
 			}
 
-			VECCOPY(mvert->co, key->co);
+			copy_v3_v3(mvert->co, key->co);
 			mul_m4_v3(hairmat, mvert->co);
 			mvert++;