Cleanup: names: data transfer/mesh remap: dm -> me/mesh.

That area is now officially purged from the Devil.. errr... DerivedMesh!

1 files changed, 66 insertions, 66 deletions

diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index b554a590104..c882cc0a7fa 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -122,8 +122,8 @@ static bool mesh_remap_bvhtree_query_raycast(
  * In other words, beyond a certain (relatively small) distance, all differences have more or less the same weight
  * in final result, which allows to reduce influence of a few high differences, in favor of a global good matching.
  */
-float BKE_mesh_remap_calc_difference_from_dm(
-        const SpaceTransform *space_transform, const MVert *verts_dst, const int numverts_dst, Mesh *dm_src)
+float BKE_mesh_remap_calc_difference_from_mesh(
+        const SpaceTransform *space_transform, const MVert *verts_dst, const int numverts_dst, Mesh *me_src)
 {
 	BVHTreeFromMesh treedata = {NULL};
 	BVHTreeNearest nearest = {0};
@@ -132,7 +132,7 @@ float BKE_mesh_remap_calc_difference_from_dm(
 	float result = 0.0f;
 	int i;
 
-	BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_VERTS, 2);
+	BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_VERTS, 2);
 	nearest.index = -1;
 
 	for (i = 0; i < numverts_dst; i++) {
@@ -251,8 +251,8 @@ static void mesh_calc_eigen_matrix(
 /**
  * Set r_space_transform so that best bbox of dst matches best bbox of src.
  */
-void BKE_mesh_remap_find_best_match_from_dm(
-        const MVert *verts_dst, const int numverts_dst, Mesh *dm_src, SpaceTransform *r_space_transform)
+void BKE_mesh_remap_find_best_match_from_mesh(
+        const MVert *verts_dst, const int numverts_dst, Mesh *me_src, SpaceTransform *r_space_transform)
 {
 	/* Note that those are done so that we successively get actual mirror matrix (by multiplication of columns)... */
 	const float mirrors[][3] = {
@@ -270,14 +270,14 @@ void BKE_mesh_remap_find_best_match_from_dm(
 	float mat_src[4][4], mat_dst[4][4], best_mat_dst[4][4];
 	float best_match = FLT_MAX, match;
 
-	const int numverts_src = dm_src->totvert;
-	float (*vcos_src)[3] = BKE_mesh_vertexCos_get(dm_src, NULL);
+	const int numverts_src = me_src->totvert;
+	float (*vcos_src)[3] = BKE_mesh_vertexCos_get(me_src, NULL);
 
 	mesh_calc_eigen_matrix(NULL, (const float (*)[3])vcos_src, numverts_src, mat_src);
 	mesh_calc_eigen_matrix(verts_dst, NULL, numverts_dst, mat_dst);
 
 	BLI_space_transform_global_from_matrices(r_space_transform, mat_dst, mat_src);
-	match = BKE_mesh_remap_calc_difference_from_dm(r_space_transform, verts_dst, numverts_dst, dm_src);
+	match = BKE_mesh_remap_calc_difference_from_mesh(r_space_transform, verts_dst, numverts_dst, me_src);
 	best_match = match;
 	copy_m4_m4(best_mat_dst, mat_dst);
 
@@ -288,7 +288,7 @@ void BKE_mesh_remap_find_best_match_from_dm(
 		mul_v3_fl(mat_dst[2], (*mirr)[2]);
 
 		BLI_space_transform_global_from_matrices(r_space_transform, mat_dst, mat_src);
-		match = BKE_mesh_remap_calc_difference_from_dm(r_space_transform, verts_dst, numverts_dst, dm_src);
+		match = BKE_mesh_remap_calc_difference_from_mesh(r_space_transform, verts_dst, numverts_dst, me_src);
 		if (match < best_match) {
 			best_match = match;
 			copy_m4_m4(best_mat_dst, mat_dst);
@@ -430,9 +430,9 @@ typedef struct IslandResult {
 /* Will be enough in 99% of cases. */
 #define MREMAP_DEFAULT_BUFSIZE 32
 
-void BKE_mesh_remap_calc_verts_from_dm(
+void BKE_mesh_remap_calc_verts_from_mesh(
         const int mode, const SpaceTransform *space_transform, const float max_dist, const float ray_radius,
-        const MVert *verts_dst, const int numverts_dst, const bool UNUSED(dirty_nors_dst), Mesh *dm_src,
+        const MVert *verts_dst, const int numverts_dst, const bool UNUSED(dirty_nors_dst), Mesh *me_src,
         MeshPairRemap *r_map)
 {
 	const float full_weight = 1.0f;
@@ -444,7 +444,7 @@ void BKE_mesh_remap_calc_verts_from_dm(
 	BKE_mesh_remap_init(r_map, numverts_dst);
 
 	if (mode == MREMAP_MODE_TOPOLOGY) {
-		BLI_assert(numverts_dst == dm_src->totvert);
+		BLI_assert(numverts_dst == me_src->totvert);
 		for (i = 0; i < numverts_dst; i++) {
 			mesh_remap_item_define(r_map, i, FLT_MAX, 0, 1, &i, &full_weight);
 		}
@@ -457,7 +457,7 @@ void BKE_mesh_remap_calc_verts_from_dm(
 		float tmp_co[3], tmp_no[3];
 
 		if (mode == MREMAP_MODE_VERT_NEAREST) {
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_VERTS, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_VERTS, 2);
 			nearest.index = -1;
 
 			for (i = 0; i < numverts_dst; i++) {
@@ -478,10 +478,10 @@ void BKE_mesh_remap_calc_verts_from_dm(
 			}
 		}
 		else if (ELEM(mode, MREMAP_MODE_VERT_EDGE_NEAREST, MREMAP_MODE_VERT_EDGEINTERP_NEAREST)) {
-			MEdge *edges_src = dm_src->medge;
-			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(dm_src, NULL);
+			MEdge *edges_src = me_src->medge;
+			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(me_src, NULL);
 
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_EDGES, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_EDGES, 2);
 			nearest.index = -1;
 
 			for (i = 0; i < numverts_dst; i++) {
@@ -529,16 +529,16 @@ void BKE_mesh_remap_calc_verts_from_dm(
 		else if (ELEM(mode, MREMAP_MODE_VERT_POLY_NEAREST, MREMAP_MODE_VERT_POLYINTERP_NEAREST,
 		                    MREMAP_MODE_VERT_POLYINTERP_VNORPROJ))
 		{
-			MPoly *polys_src = dm_src->mpoly;
-			MLoop *loops_src = dm_src->mloop;
-			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(dm_src, NULL);
+			MPoly *polys_src = me_src->mpoly;
+			MLoop *loops_src = me_src->mloop;
+			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(me_src, NULL);
 
 			size_t tmp_buff_size = MREMAP_DEFAULT_BUFSIZE;
 			float (*vcos)[3] = MEM_mallocN(sizeof(*vcos) * tmp_buff_size, __func__);
 			int *indices = MEM_mallocN(sizeof(*indices) * tmp_buff_size, __func__);
 			float *weights = MEM_mallocN(sizeof(*weights) * tmp_buff_size, __func__);
 
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_LOOPTRI, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_LOOPTRI, 2);
 
 			if (mode == MREMAP_MODE_VERT_POLYINTERP_VNORPROJ) {
 				for (i = 0; i < numverts_dst; i++) {
@@ -622,10 +622,10 @@ void BKE_mesh_remap_calc_verts_from_dm(
 	}
 }
 
-void BKE_mesh_remap_calc_edges_from_dm(
+void BKE_mesh_remap_calc_edges_from_mesh(
         const int mode, const SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         const MVert *verts_dst, const int numverts_dst, const MEdge *edges_dst, const int numedges_dst,
-        const bool UNUSED(dirty_nors_dst), Mesh *dm_src, MeshPairRemap *r_map)
+        const bool UNUSED(dirty_nors_dst), Mesh *me_src, MeshPairRemap *r_map)
 {
 	const float full_weight = 1.0f;
 	const float max_dist_sq = max_dist * max_dist;
@@ -636,7 +636,7 @@ void BKE_mesh_remap_calc_edges_from_dm(
 	BKE_mesh_remap_init(r_map, numedges_dst);
 
 	if (mode == MREMAP_MODE_TOPOLOGY) {
-		BLI_assert(numedges_dst == dm_src->totedge);
+		BLI_assert(numedges_dst == me_src->totedge);
 		for (i = 0; i < numedges_dst; i++) {
 			mesh_remap_item_define(r_map, i, FLT_MAX, 0, 1, &i, &full_weight);
 		}
@@ -649,10 +649,10 @@ void BKE_mesh_remap_calc_edges_from_dm(
 		float tmp_co[3], tmp_no[3];
 
 		if (mode == MREMAP_MODE_EDGE_VERT_NEAREST) {
-			const int num_verts_src = dm_src->totvert;
-			const int num_edges_src = dm_src->totedge;
-			MEdge *edges_src = dm_src->medge;
-			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(dm_src, NULL);
+			const int num_verts_src = me_src->totvert;
+			const int num_edges_src = me_src->totedge;
+			MEdge *edges_src = me_src->medge;
+			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(me_src, NULL);
 
 			MeshElemMap *vert_to_edge_src_map;
 			int         *vert_to_edge_src_map_mem;
@@ -669,7 +669,7 @@ void BKE_mesh_remap_calc_edges_from_dm(
 			BKE_mesh_vert_edge_map_create(&vert_to_edge_src_map, &vert_to_edge_src_map_mem,
 			                              edges_src, num_verts_src, num_edges_src);
 
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_VERTS, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_VERTS, 2);
 			nearest.index = -1;
 
 			for (i = 0; i < numedges_dst; i++) {
@@ -769,7 +769,7 @@ void BKE_mesh_remap_calc_edges_from_dm(
 			MEM_freeN(vert_to_edge_src_map_mem);
 		}
 		else if (mode == MREMAP_MODE_EDGE_NEAREST) {
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_EDGES, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_EDGES, 2);
 			nearest.index = -1;
 
 			for (i = 0; i < numedges_dst; i++) {
@@ -790,12 +790,12 @@ void BKE_mesh_remap_calc_edges_from_dm(
 			}
 		}
 		else if (mode == MREMAP_MODE_EDGE_POLY_NEAREST) {
-			MEdge *edges_src = dm_src->medge;
-			MPoly *polys_src = dm_src->mpoly;
-			MLoop *loops_src = dm_src->mloop;
-			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(dm_src, NULL);
+			MEdge *edges_src = me_src->medge;
+			MPoly *polys_src = me_src->mpoly;
+			MLoop *loops_src = me_src->mloop;
+			float (*vcos_src)[3] = BKE_mesh_vertexCos_get(me_src, NULL);
 
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_LOOPTRI, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_LOOPTRI, 2);
 
 			for (i = 0; i < numedges_dst; i++) {
 				interp_v3_v3v3(tmp_co, verts_dst[edges_dst[i].v1].co, verts_dst[edges_dst[i].v2].co, 0.5f);
@@ -814,9 +814,9 @@ void BKE_mesh_remap_calc_edges_from_dm(
 					int best_eidx_src = -1;
 
 					for (; nloops--; ml_src++) {
-						MEdge *me_src = &edges_src[ml_src->e];
-						float *co1_src = vcos_src[me_src->v1];
-						float *co2_src = vcos_src[me_src->v2];
+						MEdge *med_src = &edges_src[ml_src->e];
+						float *co1_src = vcos_src[med_src->v1];
+						float *co2_src = vcos_src[med_src->v2];
 						float co_src[3];
 						float dist_sq;
 
@@ -841,14 +841,14 @@ void BKE_mesh_remap_calc_edges_from_dm(
 		}
 		else if (mode == MREMAP_MODE_EDGE_EDGEINTERP_VNORPROJ) {
 			const int num_rays_min = 5, num_rays_max = 100;
-			const int numedges_src = dm_src->totedge;
+			const int numedges_src = me_src->totedge;
 
 			/* Subtleness - this one we can allocate only max number of cast rays per edges! */
 			int *indices = MEM_mallocN(sizeof(*indices) * (size_t)min_ii(numedges_src, num_rays_max), __func__);
 			/* Here it's simpler to just allocate for all edges :/ */
 			float *weights = MEM_mallocN(sizeof(*weights) * (size_t)numedges_src, __func__);
 
-			BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_EDGES, 2);
+			BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_EDGES, 2);
 
 			for (i = 0; i < numedges_dst; i++) {
 				/* For each dst edge, we sample some rays from it (interpolated from its vertices)
@@ -1100,13 +1100,13 @@ static float mesh_remap_calc_loops_astar_f_cost(
 #define ASTAR_STEPS_MAX 64
 
 
-void BKE_mesh_remap_calc_loops_from_dm(
+void BKE_mesh_remap_calc_loops_from_mesh(
         const int mode, const SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         MVert *verts_dst, const int numverts_dst, MEdge *edges_dst, const int numedges_dst,
         MLoop *loops_dst, const int numloops_dst, MPoly *polys_dst, const int numpolys_dst,
         CustomData *ldata_dst, CustomData *pdata_dst,
         const bool use_split_nors_dst, const float split_angle_dst, const bool dirty_nors_dst,
-        Mesh *dm_src,
+        Mesh *me_src,
         MeshRemapIslandsCalc gen_islands_src, const float islands_precision_src, MeshPairRemap *r_map)
 {
 	const float full_weight = 1.0f;
@@ -1121,7 +1121,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 
 	if (mode == MREMAP_MODE_TOPOLOGY) {
 		/* In topology mapping, we assume meshes are identical, islands included! */
-		BLI_assert(numloops_dst == dm_src->totloop);
+		BLI_assert(numloops_dst == me_src->totloop);
 		for (i = 0; i < numloops_dst; i++) {
 			mesh_remap_item_define(r_map, i, FLT_MAX, 0, 1, &i, &full_weight);
 		}
@@ -1163,15 +1163,15 @@ void BKE_mesh_remap_calc_loops_from_dm(
 		/* Unlike above, those are one-to-one mappings, simpler! */
 		int *loop_to_poly_map_src = NULL;
 
-		MVert *verts_src = dm_src->mvert;
-		const int num_verts_src = dm_src->totvert;
+		MVert *verts_src = me_src->mvert;
+		const int num_verts_src = me_src->totvert;
 		float (*vcos_src)[3] = NULL;
-		MEdge *edges_src = dm_src->medge;
-		const int num_edges_src = dm_src->totedge;
-		MLoop *loops_src = dm_src->mloop;
-		const int num_loops_src = dm_src->totloop;
-		MPoly *polys_src = dm_src->mpoly;
-		const int num_polys_src = dm_src->totpoly;
+		MEdge *edges_src = me_src->medge;
+		const int num_edges_src = me_src->totedge;
+		MLoop *loops_src = me_src->mloop;
+		const int num_loops_src = me_src->totloop;
+		MPoly *polys_src = me_src->mpoly;
+		const int num_polys_src = me_src->totpoly;
 		const MLoopTri *looptri_src = NULL;
 		int num_looptri_src = 0;
 
@@ -1188,7 +1188,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 		size_t islands_res_buff_size = MREMAP_DEFAULT_BUFSIZE;
 
 		if (!use_from_vert) {
-			vcos_src = BKE_mesh_vertexCos_get(dm_src, NULL);
+			vcos_src = BKE_mesh_vertexCos_get(me_src, NULL);
 
 			vcos_interp = MEM_mallocN(sizeof(*vcos_interp) * buff_size_interp, __func__);
 			indices_interp = MEM_mallocN(sizeof(*indices_interp) * buff_size_interp, __func__);
@@ -1233,17 +1233,17 @@ void BKE_mesh_remap_calc_loops_from_dm(
 			}
 			if (need_pnors_src || need_lnors_src) {
 				/* Simpler for now, calcNormals never stores pnors :( */
-				if (!CustomData_has_layer(&dm_src->pdata, CD_NORMAL)) {
-					CustomData_add_layer(&dm_src->pdata, CD_NORMAL, CD_CALLOC, NULL, dm_src->totpoly);
-					CustomData_set_layer_flag(&dm_src->pdata, CD_NORMAL, CD_FLAG_TEMPORARY);
+				if (!CustomData_has_layer(&me_src->pdata, CD_NORMAL)) {
+					CustomData_add_layer(&me_src->pdata, CD_NORMAL, CD_CALLOC, NULL, me_src->totpoly);
+					CustomData_set_layer_flag(&me_src->pdata, CD_NORMAL, CD_FLAG_TEMPORARY);
 				}
-				BKE_mesh_calc_normals_split(dm_src);
+				BKE_mesh_calc_normals_split(me_src);
 
 				if (need_pnors_src) {
-					poly_nors_src = CustomData_get_layer(&dm_src->pdata, CD_NORMAL);
+					poly_nors_src = CustomData_get_layer(&me_src->pdata, CD_NORMAL);
 				}
 				if (need_lnors_src) {
-					loop_nors_src = CustomData_get_layer(&dm_src->ldata, CD_NORMAL);
+					loop_nors_src = CustomData_get_layer(&me_src->ldata, CD_NORMAL);
 				}
 			}
 		}
@@ -1347,7 +1347,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 			}
 			else {
 				BLI_assert(num_trees == 1);
-				BKE_bvhtree_from_mesh_get(&treedata[0], dm_src, BVHTREE_FROM_VERTS, 2);
+				BKE_bvhtree_from_mesh_get(&treedata[0], me_src, BVHTREE_FROM_VERTS, 2);
 			}
 		}
 		else {  /* We use polygons. */
@@ -1355,8 +1355,8 @@ void BKE_mesh_remap_calc_loops_from_dm(
 				/* bvhtree here uses looptri faces... */
 				BLI_bitmap *looptri_active;
 
-				looptri_src = BKE_mesh_runtime_looptri_ensure(dm_src);
-				num_looptri_src = dm_src->runtime.looptris.len;
+				looptri_src = BKE_mesh_runtime_looptri_ensure(me_src);
+				num_looptri_src = me_src->runtime.looptris.len;
 				looptri_active = BLI_BITMAP_NEW((size_t)num_looptri_src, __func__);
 
 				for (tindex = 0; tindex < num_trees; tindex++) {
@@ -1381,7 +1381,7 @@ void BKE_mesh_remap_calc_loops_from_dm(
 			}
 			else {
 				BLI_assert(num_trees == 1);
-				BKE_bvhtree_from_mesh_get(&treedata[0], dm_src, BVHTREE_FROM_LOOPTRI, 2);
+				BKE_bvhtree_from_mesh_get(&treedata[0], me_src, BVHTREE_FROM_LOOPTRI, 2);
 			}
 		}
 
@@ -1925,11 +1925,11 @@ void BKE_mesh_remap_calc_loops_from_dm(
 	}
 }
 
-void BKE_mesh_remap_calc_polys_from_dm(
+void BKE_mesh_remap_calc_polys_from_mesh(
         const int mode, const SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         MVert *verts_dst, const int numverts_dst, MLoop *loops_dst, const int numloops_dst,
         MPoly *polys_dst, const int numpolys_dst, CustomData *pdata_dst, const bool dirty_nors_dst,
-        Mesh *dm_src, MeshPairRemap *r_map)
+        Mesh *me_src, MeshPairRemap *r_map)
 {
 	const float full_weight = 1.0f;
 	const float max_dist_sq = max_dist * max_dist;
@@ -1955,7 +1955,7 @@ void BKE_mesh_remap_calc_polys_from_dm(
 	BKE_mesh_remap_init(r_map, numpolys_dst);
 
 	if (mode == MREMAP_MODE_TOPOLOGY) {
-		BLI_assert(numpolys_dst == dm_src->totpoly);
+		BLI_assert(numpolys_dst == me_src->totpoly);
 		for (i = 0; i < numpolys_dst; i++) {
 			mesh_remap_item_define(r_map, i, FLT_MAX, 0, 1, &i, &full_weight);
 		}
@@ -1966,7 +1966,7 @@ void BKE_mesh_remap_calc_polys_from_dm(
 		BVHTreeRayHit rayhit = {0};
 		float hit_dist;
 
-		BKE_bvhtree_from_mesh_get(&treedata, dm_src, BVHTREE_FROM_LOOPTRI, 2);
+		BKE_bvhtree_from_mesh_get(&treedata, me_src, BVHTREE_FROM_LOOPTRI, 2);
 
 		if (mode == MREMAP_MODE_POLY_NEAREST) {
 			nearest.index = -1;
@@ -2031,7 +2031,7 @@ void BKE_mesh_remap_calc_polys_from_dm(
 			 */
 			RNG *rng = BLI_rng_new(0);
 
-			const size_t numpolys_src = (size_t)dm_src->totpoly;
+			const size_t numpolys_src = (size_t)me_src->totpoly;
 
 			/* Here it's simpler to just allocate for all polys :/ */
 			int *indices = MEM_mallocN(sizeof(*indices) * numpolys_src, __func__);