Cleanup: unused code

2 files changed, 4 insertions, 711 deletions

diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 0d2d6057e8a..f2c0b96aa80 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -63,15 +63,6 @@ struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps);
 /* creates a CDDerivedMesh from the given BMEditMesh */
 DerivedMesh *CDDM_from_editbmesh(struct BMEditMesh *em, const bool use_mdisps, const bool use_tessface);
 
-/* merge verts  */
-/* Enum for merge_mode of CDDM_merge_verts.
- * Refer to cdderivedmesh.c for details. */
-enum {
-	CDDM_MERGE_VERTS_DUMP_IF_MAPPED,
-	CDDM_MERGE_VERTS_DUMP_IF_EQUAL,
-};
-DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int tot_vtargetmap, const int merge_mode);
-
 /* creates a CDDerivedMesh from the given curve object */
 struct DerivedMesh *CDDM_from_curve(struct Object *ob);
 
@@ -83,8 +74,6 @@ DerivedMesh *CDDM_from_curve_displist(struct Object *ob, struct ListBase *dispba
  * custom element data.
  */
 struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm);
-struct DerivedMesh *CDDM_copy_from_tessface(struct DerivedMesh *dm);
-struct DerivedMesh *CDDM_copy_with_tessface(struct DerivedMesh *dm);
 
 /* creates a CDDerivedMesh with the same layer stack configuration as the
  * given DerivedMesh and containing the requested numbers of elements.
@@ -100,11 +89,6 @@ struct DerivedMesh *CDDM_from_template(
         int numVerts, int numEdges, int numFaces,
         int numLoops, int numPolys);
 
-/* converts mfaces to mpolys.  note things may break if there are not valid
- * medges surrounding each mface.
- */
-void CDDM_tessfaces_to_faces(struct DerivedMesh *dm);
-
 /* applies vertex coordinates or normals to a CDDerivedMesh. if the MVert
  * layer is a referenced layer, it will be duplicate to not overwrite the
  * original
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 298a6ab0ec4..1c3b75b1771 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -938,16 +938,13 @@ DerivedMesh *CDDM_from_editbmesh(BMEditMesh *em, const bool use_mdisps, const bo
 	        use_tessface, em->tottri, (const BMLoop *(*)[3])em->looptris);
 }
 
-static DerivedMesh *cddm_copy_ex(DerivedMesh *source,
-                                 const bool need_tessface_data,
-                                 const bool faces_from_tessfaces)
+DerivedMesh *CDDM_copy(DerivedMesh *source)
 {
-	const bool copy_tessface_data = (faces_from_tessfaces || need_tessface_data);
 	CDDerivedMesh *cddm = cdDM_create("CDDM_copy cddm");
 	DerivedMesh *dm = &cddm->dm;
 	int numVerts = source->numVertData;
 	int numEdges = source->numEdgeData;
-	int numTessFaces = copy_tessface_data ? source->numTessFaceData : 0;
+	int numTessFaces = 0;
 	int numLoops = source->numLoopData;
 	int numPolys = source->numPolyData;
 
@@ -957,9 +954,6 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source,
 	source->getVertDataArray(source, CD_ORIGINDEX);
 	source->getEdgeDataArray(source, CD_ORIGINDEX);
 	source->getPolyDataArray(source, CD_ORIGINDEX);
-	if (copy_tessface_data) {
-		source->getTessFaceDataArray(source, CD_ORIGINDEX);
-	}
 
 	/* this initializes dm, and copies all non mvert/medge/mface layers */
 	DM_from_template(dm, source, DM_TYPE_CDDM, numVerts, numEdges, numTessFaces,
@@ -971,15 +965,10 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source,
 	/* Tessellation data is never copied, so tag it here.
 	 * Only tag dirty layers if we really ignored tessellation faces.
 	 */
-	if (!copy_tessface_data) {
-		dm->dirty |= DM_DIRTY_TESS_CDLAYERS;
-	}
+	dm->dirty |= DM_DIRTY_TESS_CDLAYERS;
 
 	CustomData_copy_data(&source->vertData, &dm->vertData, 0, 0, numVerts);
 	CustomData_copy_data(&source->edgeData, &dm->edgeData, 0, 0, numEdges);
-	if (copy_tessface_data) {
-		CustomData_copy_data(&source->faceData, &dm->faceData, 0, 0, numTessFaces);
-	}
 
 	/* now add mvert/medge/mface layers */
 	cddm->mvert = source->dupVertArray(source);
@@ -988,17 +977,7 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source,
 	CustomData_add_layer(&dm->vertData, CD_MVERT, CD_ASSIGN, cddm->mvert, numVerts);
 	CustomData_add_layer(&dm->edgeData, CD_MEDGE, CD_ASSIGN, cddm->medge, numEdges);
 
-	if (faces_from_tessfaces || copy_tessface_data) {
-		cddm->mface = source->dupTessFaceArray(source);
-		CustomData_add_layer(&dm->faceData, CD_MFACE, CD_ASSIGN, cddm->mface, numTessFaces);
-	}
-
-	if (!faces_from_tessfaces) {
-		DM_DupPolys(source, dm);
-	}
-	else {
-		CDDM_tessfaces_to_faces(dm);
-	}
+	DM_DupPolys(source, dm);
 
 	cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP);
 	cddm->mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
@@ -1006,21 +985,6 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source,
 	return dm;
 }
 
-DerivedMesh *CDDM_copy(DerivedMesh *source)
-{
-	return cddm_copy_ex(source, false, false);
-}
-
-DerivedMesh *CDDM_copy_from_tessface(DerivedMesh *source)
-{
-	return cddm_copy_ex(source, false, true);
-}
-
-DerivedMesh *CDDM_copy_with_tessface(DerivedMesh *source)
-{
-	return cddm_copy_ex(source, true, false);
-}
-
 /* note, the CD_ORIGINDEX layers are all 0, so if there is a direct
  * relationship between mesh data this needs to be set by the caller. */
 DerivedMesh *CDDM_from_template_ex(
@@ -1289,647 +1253,6 @@ void CDDM_calc_loop_normals_spacearr(
 #endif
 }
 
-#if 1
-/* TODO(sybren): Delete everything in this #if block after we have ported the modifiers
- * to use Mesh instead of DerivedMesh. The code has been copied to mesh_merge.c and ported. */
-/**
- * Poly compare with vtargetmap
- * Function used by #CDDM_merge_verts.
- * The function compares poly_source after applying vtargetmap, with poly_target.
- * The two polys are identical if they share the same vertices in the same order, or in reverse order,
- * but starting position loopstart may be different.
- * The function is called with direct_reverse=1 for same order (i.e. same normal),
- * and may be called again with direct_reverse=-1 for reverse order.
- * \return 1 if polys are identical,  0 if polys are different.
- */
-static int cddm_poly_compare(
-        MLoop *mloop_array,
-        MPoly *mpoly_source, MPoly *mpoly_target,
-        const int *vtargetmap, const int direct_reverse)
-{
-	int vert_source, first_vert_source, vert_target;
-	int i_loop_source;
-	int i_loop_target, i_loop_target_start, i_loop_target_offset, i_loop_target_adjusted;
-	bool compare_completed = false;
-	bool same_loops = false;
-
-	MLoop *mloop_source, *mloop_target;
-
-	BLI_assert(direct_reverse == 1 || direct_reverse == -1);
-
-	i_loop_source = 0;
-	mloop_source = mloop_array + mpoly_source->loopstart;
-	vert_source = mloop_source->v;
-
-	if (vtargetmap[vert_source] != -1) {
-		vert_source = vtargetmap[vert_source];
-	}
-	else {
-		/* All source loop vertices should be mapped */
-		BLI_assert(false);
-	}
-
-	/* Find same vertex within mpoly_target's loops */
-	mloop_target = mloop_array + mpoly_target->loopstart;
-	for (i_loop_target = 0; i_loop_target < mpoly_target->totloop; i_loop_target++, mloop_target++) {
-		if (mloop_target->v == vert_source) {
-			break;
-		}
-	}
-
-	/* If same vertex not found, then polys cannot be equal */
-	if (i_loop_target >= mpoly_target->totloop) {
-		return false;
-	}
-
-	/* Now mloop_source and m_loop_target have one identical vertex */
-	/* mloop_source is at position 0, while m_loop_target has advanced to find identical vertex */
-	/* Go around the loop and check that all vertices match in same order */
-	/* Skipping source loops when consecutive source vertices are mapped to same target vertex */
-
-	i_loop_target_start = i_loop_target;
-	i_loop_target_offset = 0;
-	first_vert_source = vert_source;
-
-	compare_completed = false;
-	same_loops = false;
-
-	while (!compare_completed) {
-
-		vert_target = mloop_target->v;
-
-		/* First advance i_loop_source, until it points to different vertex, after mapping applied */
-		do {
-			i_loop_source++;
-
-			if (i_loop_source == mpoly_source->totloop) {
-				/* End of loops for source, must match end of loop for target.  */
-				if (i_loop_target_offset == mpoly_target->totloop - 1) {
-					compare_completed = true;
-					same_loops = true;
-					break;  /* Polys are identical */
-				}
-				else {
-					compare_completed = true;
-					same_loops = false;
-					break;  /* Polys are different */
-				}
-			}
-
-			mloop_source++;
-			vert_source = mloop_source->v;
-
-			if (vtargetmap[vert_source] != -1) {
-				vert_source = vtargetmap[vert_source];
-			}
-			else {
-				/* All source loop vertices should be mapped */
-				BLI_assert(false);
-			}
-
-		} while (vert_source == vert_target);
-
-		if (compare_completed) {
-			break;
-		}
-
-		/* Now advance i_loop_target as well */
-		i_loop_target_offset++;
-
-		if (i_loop_target_offset == mpoly_target->totloop) {
-			/* End of loops for target only, that means no match */
-			/* except if all remaining source vertices are mapped to first target */
-			for (; i_loop_source < mpoly_source->totloop; i_loop_source++, mloop_source++) {
-				vert_source = vtargetmap[mloop_source->v];
-				if (vert_source != first_vert_source) {
-					compare_completed = true;
-					same_loops = false;
-					break;
-				}
-			}
-			if (!compare_completed) {
-				same_loops = true;
-			}
-			break;
-		}
-
-		/* Adjust i_loop_target for cycling around and for direct/reverse order defined by delta = +1 or -1 */
-		i_loop_target_adjusted = (i_loop_target_start + direct_reverse * i_loop_target_offset) % mpoly_target->totloop;
-		if (i_loop_target_adjusted < 0) {
-			i_loop_target_adjusted += mpoly_target->totloop;
-		}
-		mloop_target = mloop_array + mpoly_target->loopstart + i_loop_target_adjusted;
-		vert_target = mloop_target->v;
-
-		if (vert_target != vert_source) {
-			same_loops = false;  /* Polys are different */
-			break;
-		}
-	}
-	return same_loops;
-}
-
-/* Utility stuff for using GHash with polys */
-
-typedef struct PolyKey {
-	int poly_index;   /* index of the MPoly within the derived mesh */
-	int totloops;     /* number of loops in the poly */
-	unsigned int hash_sum;  /* Sum of all vertices indices */
-	unsigned int hash_xor;  /* Xor of all vertices indices */
-} PolyKey;
-
-
-static unsigned int poly_gset_hash_fn(const void *key)
-{
-	const PolyKey *pk = key;
-	return pk->hash_sum;
-}
-
-static bool poly_gset_compare_fn(const void *k1, const void *k2)
-{
-	const PolyKey *pk1 = k1;
-	const PolyKey *pk2 = k2;
-	if ((pk1->hash_sum == pk2->hash_sum) &&
-	    (pk1->hash_xor == pk2->hash_xor) &&
-	    (pk1->totloops == pk2->totloops))
-	{
-		/* Equality - note that this does not mean equality of polys */
-		return false;
-	}
-	else {
-		return true;
-	}
-}
-
-/**
- * Merge Verts
- *
- * This frees dm, and returns a new one.
- *
- * \param vtargetmap  The table that maps vertices to target vertices.  a value of -1
- * indicates a vertex is a target, and is to be kept.
- * This array is aligned with 'dm->numVertData'
- * \warning \a vtargetmap must **not** contain any chained mapping (v1 -> v2 -> v3 etc.), this is not supported
- * and will likely generate corrupted geometry.
- *
- * \param tot_vtargetmap  The number of non '-1' values in vtargetmap. (not the size)
- *
- * \param merge_mode enum with two modes.
- * - #CDDM_MERGE_VERTS_DUMP_IF_MAPPED
- * When called by the Mirror Modifier,
- * In this mode it skips any faces that have all vertices merged (to avoid creating pairs
- * of faces sharing the same set of vertices)
- * - #CDDM_MERGE_VERTS_DUMP_IF_EQUAL
- * When called by the Array Modifier,
- * In this mode, faces where all vertices are merged are double-checked,
- * to see whether all target vertices actually make up a poly already.
- * Indeed it could be that all of a poly's vertices are merged,
- * but merged to vertices that do not make up a single poly,
- * in which case the original poly should not be dumped.
- * Actually this later behavior could apply to the Mirror Modifier as well, but the additional checks are
- * costly and not necessary in the case of mirror, because each vertex is only merged to its own mirror.
- *
- * \note #CDDM_recalc_tessellation has to run on the returned DM if you want to access tessfaces.
- */
-DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int tot_vtargetmap, const int merge_mode)
-{
-// This was commented out back in 2013, see commit f45d8827bafe6b9eaf9de42f4054e9d84a21955d.
-// #define USE_LOOPS
-	CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
-	CDDerivedMesh *cddm2 = NULL;
-
-	const int totvert = dm->numVertData;
-	const int totedge = dm->numEdgeData;
-	const int totloop = dm->numLoopData;
-	const int totpoly = dm->numPolyData;
-
-	const int totvert_final = totvert - tot_vtargetmap;
-
-	MVert *mv, *mvert = MEM_malloc_arrayN(totvert_final, sizeof(*mvert), __func__);
-	int *oldv         = MEM_malloc_arrayN(totvert_final, sizeof(*oldv), __func__);
-	int *newv         = MEM_malloc_arrayN(totvert, sizeof(*newv), __func__);
-	STACK_DECLARE(mvert);
-	STACK_DECLARE(oldv);
-
-	/* Note: create (totedge + totloop) elements because partially invalid polys due to merge may require
-	 * generating new edges, and while in 99% cases we'll still end with less final edges than totedge,
-	 * cases can be forged that would end requiring more... */
-	MEdge *med, *medge = MEM_malloc_arrayN((totedge + totloop), sizeof(*medge), __func__);
-	int *olde          = MEM_malloc_arrayN((totedge + totloop), sizeof(*olde), __func__);
-	int *newe          = MEM_malloc_arrayN((totedge + totloop), sizeof(*newe), __func__);
-	STACK_DECLARE(medge);
-	STACK_DECLARE(olde);
-
-	MLoop *ml, *mloop = MEM_malloc_arrayN(totloop, sizeof(*mloop), __func__);
-	int *oldl         = MEM_malloc_arrayN(totloop, sizeof(*oldl), __func__);
-#ifdef USE_LOOPS
-	int *newl         = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__);
-#endif
-	STACK_DECLARE(mloop);
-	STACK_DECLARE(oldl);
-
-	MPoly *mp, *mpoly = MEM_malloc_arrayN(totpoly, sizeof(*medge), __func__);
-	int *oldp         = MEM_malloc_arrayN(totpoly, sizeof(*oldp), __func__);
-	STACK_DECLARE(mpoly);
-	STACK_DECLARE(oldp);
-
-	EdgeHash *ehash = BLI_edgehash_new_ex(__func__, totedge);
-
-	int i, j, c;
-
-	PolyKey *poly_keys;
-	GSet *poly_gset = NULL;
-
-	STACK_INIT(oldv, totvert_final);
-	STACK_INIT(olde, totedge);
-	STACK_INIT(oldl, totloop);
-	STACK_INIT(oldp, totpoly);
-
-	STACK_INIT(mvert, totvert_final);
-	STACK_INIT(medge, totedge);
-	STACK_INIT(mloop, totloop);
-	STACK_INIT(mpoly, totpoly);
-
-	/* fill newv with destination vertex indices */
-	mv = cddm->mvert;
-	c = 0;
-	for (i = 0; i < totvert; i++, mv++) {
-		if (vtargetmap[i] == -1) {
-			STACK_PUSH(oldv, i);
-			STACK_PUSH(mvert, *mv);
-			newv[i] = c++;
-		}
-		else {
-			/* dummy value */
-			newv[i] = 0;
-		}
-	}
-
-	/* now link target vertices to destination indices */
-	for (i = 0; i < totvert; i++) {
-		if (vtargetmap[i] != -1) {
-			newv[i] = newv[vtargetmap[i]];
-		}
-	}
-
-	/* Don't remap vertices in cddm->mloop, because we need to know the original
-	 * indices in order to skip faces with all vertices merged.
-	 * The "update loop indices..." section further down remaps vertices in mloop.
-	 */
-
-	/* now go through and fix edges and faces */
-	med = cddm->medge;
-	c = 0;
-	for (i = 0; i < totedge; i++, med++) {
-		const unsigned int v1 = (vtargetmap[med->v1] != -1) ? vtargetmap[med->v1] : med->v1;
-		const unsigned int v2 = (vtargetmap[med->v2] != -1) ? vtargetmap[med->v2] : med->v2;
-		if (LIKELY(v1 != v2)) {
-			void **val_p;
-
-			if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) {
-				newe[i] = POINTER_AS_INT(*val_p);
-			}
-			else {
-				STACK_PUSH(olde, i);
-				STACK_PUSH(medge, *med);
-				newe[i] = c;
-				*val_p = POINTER_FROM_INT(c);
-				c++;
-			}
-		}
-		else {
-			newe[i] = -1;
-		}
-	}
-
-	if (merge_mode == CDDM_MERGE_VERTS_DUMP_IF_EQUAL) {
-		/* In this mode, we need to determine,  whenever a poly' vertices are all mapped */
-		/* if the targets already make up a poly, in which case the new poly is dropped */
-		/* This poly equality check is rather complex.   We use a BLI_ghash to speed it up with a first level check */
-		PolyKey *mpgh;
-		poly_keys = MEM_malloc_arrayN(totpoly, sizeof(PolyKey), __func__);
-		poly_gset = BLI_gset_new_ex(poly_gset_hash_fn, poly_gset_compare_fn, __func__, totpoly);
-		/* Duplicates allowed because our compare function is not pure equality */
-		BLI_gset_flag_set(poly_gset, GHASH_FLAG_ALLOW_DUPES);
-
-		mp = cddm->mpoly;
-		mpgh = poly_keys;
-		for (i = 0; i < totpoly; i++, mp++, mpgh++) {
-			mpgh->poly_index = i;
-			mpgh->totloops = mp->totloop;
-			ml = cddm->mloop + mp->loopstart;
-			mpgh->hash_sum = mpgh->hash_xor = 0;
-			for (j = 0; j < mp->totloop; j++, ml++) {
-				mpgh->hash_sum += ml->v;
-				mpgh->hash_xor ^= ml->v;
-			}
-			BLI_gset_insert(poly_gset, mpgh);
-		}
-
-		if (cddm->pmap) {
-			MEM_freeN(cddm->pmap);
-			MEM_freeN(cddm->pmap_mem);
-		}
-		/* Can we optimise by reusing an old pmap ?  How do we know an old pmap is stale ?  */
-		/* When called by MOD_array.c, the cddm has just been created, so it has no valid pmap.   */
-		BKE_mesh_vert_poly_map_create(&cddm->pmap, &cddm->pmap_mem,
-		                              cddm->mpoly, cddm->mloop,
-		                              totvert, totpoly, totloop);
-	}  /* done preparing for fast poly compare */
-
-
-	mp = cddm->mpoly;
-	mv = cddm->mvert;
-	for (i = 0; i < totpoly; i++, mp++) {
-		MPoly *mp_new;
-
-		ml = cddm->mloop + mp->loopstart;
-
-		/* check faces with all vertices merged */
-		bool all_vertices_merged = true;
-
-		for (j = 0; j < mp->totloop; j++, ml++) {
-			if (vtargetmap[ml->v] == -1) {
-				all_vertices_merged = false;
-				/* This will be used to check for poly using several time the same vert. */
-				mv[ml->v].flag &= ~ME_VERT_TMP_TAG;
-			}
-			else {
-				/* This will be used to check for poly using several time the same vert. */
-				mv[vtargetmap[ml->v]].flag &= ~ME_VERT_TMP_TAG;
-			}
-		}
-
-		if (UNLIKELY(all_vertices_merged)) {
-			if (merge_mode == CDDM_MERGE_VERTS_DUMP_IF_MAPPED) {
-				/* In this mode, all vertices merged is enough to dump face */
-				continue;
-			}
-			else if (merge_mode == CDDM_MERGE_VERTS_DUMP_IF_EQUAL) {
-				/* Additional condition for face dump:  target vertices must make up an identical face */
-				/* The test has 2 steps:  (1) first step is fast ghash lookup, but not failproof       */
-				/*                        (2) second step is thorough but more costly poly compare     */
-				int i_poly, v_target;
-				bool found = false;
-				PolyKey pkey;
-
-				/* Use poly_gset for fast (although not 100% certain) identification of same poly */
-				/* First, make up a poly_summary structure */
-				ml = cddm->mloop + mp->loopstart;
-				pkey.hash_sum = pkey.hash_xor = 0;
-				pkey.totloops = 0;
-				for (j = 0; j < mp->totloop; j++, ml++) {
-					v_target = vtargetmap[ml->v];   /* Cannot be -1, they are all mapped */
-					pkey.hash_sum += v_target;
-					pkey.hash_xor ^= v_target;
-					pkey.totloops++;
-				}
-				if (BLI_gset_haskey(poly_gset, &pkey)) {
-
-					/* There might be a poly that matches this one.
-					 * We could just leave it there and say there is, and do a "continue".
-					 * ... but we are checking whether there is an exact poly match.
-					 * It's not so costly in terms of CPU since it's very rare, just a lot of complex code.
-					 */
-
-					/* Consider current loop again */
-					ml = cddm->mloop + mp->loopstart;
-					/* Consider the target of the loop's first vert */
-					v_target = vtargetmap[ml->v];
-					/* Now see if v_target belongs to a poly that shares all vertices with source poly,
-					 * in same order, or reverse order */
-
-					for (i_poly = 0; i_poly < cddm->pmap[v_target].count; i_poly++) {
-						MPoly *target_poly = cddm->mpoly + *(cddm->pmap[v_target].indices + i_poly);
-
-						if (cddm_poly_compare(cddm->mloop, mp, target_poly, vtargetmap, +1) ||
-						    cddm_poly_compare(cddm->mloop, mp, target_poly, vtargetmap, -1))
-						{
-							found = true;
-							break;
-						}
-					}
-					if (found) {
-						/* Current poly's vertices are mapped to a poly that is strictly identical */
-						/* Current poly is dumped */
-						continue;
-					}
-				}
-			}
-		}
-
-
-		/* Here either the poly's vertices were not all merged
-		 * or they were all merged, but targets do not make up an identical poly,
-		 * the poly is retained.
-		 */
-		ml = cddm->mloop + mp->loopstart;
-
-		c = 0;
-		MLoop *last_valid_ml = NULL;
-		MLoop *first_valid_ml = NULL;
-		bool need_edge_from_last_valid_ml = false;
-		bool need_edge_to_first_valid_ml = false;
-		int created_edges = 0;
-		for (j = 0; j < mp->totloop; j++, ml++) {
-			const uint mlv = (vtargetmap[ml->v] != -1) ? vtargetmap[ml->v] : ml->v;
-#ifndef NDEBUG
-			{
-				MLoop *next_ml = cddm->mloop + mp->loopstart + ((j + 1) % mp->totloop);
-				uint next_mlv = (vtargetmap[next_ml->v] != -1) ? vtargetmap[next_ml->v] : next_ml->v;
-				med = cddm->medge + ml->e;
-				uint v1 = (vtargetmap[med->v1] != -1) ? vtargetmap[med->v1] : med->v1;
-				uint v2 = (vtargetmap[med->v2] != -1) ? vtargetmap[med->v2] : med->v2;
-				BLI_assert((mlv == v1 && next_mlv == v2) || (mlv == v2 && next_mlv == v1));
-			}
-#endif
-			/* A loop is only valid if its matching edge is, and it's not reusing a vertex already used by this poly. */
-			if (LIKELY((newe[ml->e] != -1) && ((mv[mlv].flag & ME_VERT_TMP_TAG) == 0))) {
-				mv[mlv].flag |= ME_VERT_TMP_TAG;
-
-				if (UNLIKELY(last_valid_ml != NULL && need_edge_from_last_valid_ml)) {
-					/* We need to create a new edge between last valid loop and this one! */
-					void **val_p;
-
-					uint v1 = (vtargetmap[last_valid_ml->v] != -1) ? vtargetmap[last_valid_ml->v] : last_valid_ml->v;
-					uint v2 = mlv;
-					BLI_assert(v1 != v2);
-					if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) {
-						last_valid_ml->e = POINTER_AS_INT(*val_p);
-					}
-					else {
-						const int new_eidx = STACK_SIZE(medge);
-						STACK_PUSH(olde, olde[last_valid_ml->e]);
-						STACK_PUSH(medge, cddm->medge[last_valid_ml->e]);
-						medge[new_eidx].v1 = last_valid_ml->v;
-						medge[new_eidx].v2 = ml->v;
-						/* DO NOT change newe mapping, could break actual values due to some deleted original edges. */
-						*val_p = POINTER_FROM_INT(new_eidx);
-						created_edges++;
-
-						last_valid_ml->e = new_eidx;
-					}
-					need_edge_from_last_valid_ml = false;
-				}
-
-#ifdef USE_LOOPS
-				newl[j + mp->loopstart] = STACK_SIZE(mloop);
-#endif
-				STACK_PUSH(oldl, j + mp->loopstart);
-				last_valid_ml = STACK_PUSH_RET_PTR(mloop);
-				*last_valid_ml = *ml;
-				if (first_valid_ml == NULL) {
-					first_valid_ml = last_valid_ml;
-				}
-				c++;
-
-				/* We absolutely HAVE to handle edge index remapping here, otherwise potential newly created edges
-				 * in that part of code make remapping later totally unreliable. */
-				BLI_assert(newe[ml->e] != -1);
-				last_valid_ml->e = newe[ml->e];
-			}
-			else {
-				if (last_valid_ml != NULL) {
-					need_edge_from_last_valid_ml = true;
-				}
-				else {
-					need_edge_to_first_valid_ml = true;
-				}
-			}
-		}
-		if (UNLIKELY(last_valid_ml != NULL && !ELEM(first_valid_ml, NULL, last_valid_ml) &&
-		             (need_edge_to_first_valid_ml || need_edge_from_last_valid_ml)))
-		{
-			/* We need to create a new edge between last valid loop and first valid one! */
-			void **val_p;
-
-			uint v1 = (vtargetmap[last_valid_ml->v] != -1) ? vtargetmap[last_valid_ml->v] : last_valid_ml->v;
-			uint v2 = (vtargetmap[first_valid_ml->v] != -1) ? vtargetmap[first_valid_ml->v] : first_valid_ml->v;
-			BLI_assert(v1 != v2);
-			if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) {
-				last_valid_ml->e = POINTER_AS_INT(*val_p);
-			}
-			else {
-				const int new_eidx = STACK_SIZE(medge);
-				STACK_PUSH(olde, olde[last_valid_ml->e]);
-				STACK_PUSH(medge, cddm->medge[last_valid_ml->e]);
-				medge[new_eidx].v1 = last_valid_ml->v;
-				medge[new_eidx].v2 = first_valid_ml->v;
-				/* DO NOT change newe mapping, could break actual values due to some deleted original edges. */
-				*val_p = POINTER_FROM_INT(new_eidx);
-				created_edges++;
-
-				last_valid_ml->e = new_eidx;
-			}
-			need_edge_to_first_valid_ml = need_edge_from_last_valid_ml = false;
-		}
-
-		if (UNLIKELY(c == 0)) {
-			BLI_assert(created_edges == 0);
-			continue;
-		}
-		else if (UNLIKELY(c < 3)) {
-			STACK_DISCARD(oldl, c);
-			STACK_DISCARD(mloop, c);
-			if (created_edges > 0) {
-				for (j = STACK_SIZE(medge) - created_edges; j < STACK_SIZE(medge); j++) {
-					BLI_edgehash_remove(ehash, medge[j].v1, medge[j].v2, NULL);
-				}
-				STACK_DISCARD(olde, created_edges);
-				STACK_DISCARD(medge, created_edges);
-			}
-			continue;
-		}
-
-		mp_new = STACK_PUSH_RET_PTR(mpoly);
-		*mp_new = *mp;
-		mp_new->totloop = c;
-		BLI_assert(mp_new->totloop >= 3);
-		mp_new->loopstart = STACK_SIZE(mloop) - c;
-
-		STACK_PUSH(oldp, i);
-	}  /* end of the loop that tests polys   */
-
-
-	if (poly_gset) {
-		// printf("hash quality %.6f\n", BLI_gset_calc_quality(poly_gset));
-
-		BLI_gset_free(poly_gset, NULL);
-		MEM_freeN(poly_keys);
-	}
-
-	/*create new cddm*/
-	cddm2 = (CDDerivedMesh *)CDDM_from_template(
-	        (DerivedMesh *)cddm, STACK_SIZE(mvert), STACK_SIZE(medge), 0, STACK_SIZE(mloop), STACK_SIZE(mpoly));
-
-	/*update edge indices and copy customdata*/
-	med = medge;
-	for (i = 0; i < cddm2->dm.numEdgeData; i++, med++) {
-		BLI_assert(newv[med->v1] != -1);
-		med->v1 = newv[med->v1];
-		BLI_assert(newv[med->v2] != -1);
-		med->v2 = newv[med->v2];
-
-		/* Can happen in case vtargetmap contains some double chains, we do not support that. */
-		BLI_assert(med->v1 != med->v2);
-
-		CustomData_copy_data(&dm->edgeData, &cddm2->dm.edgeData, olde[i], i, 1);
-	}
-
-	/*update loop indices and copy customdata*/
-	ml = mloop;
-	for (i = 0; i < cddm2->dm.numLoopData; i++, ml++) {
-		/* Edge remapping has already be done in main loop handling part above. */
-		BLI_assert(newv[ml->v] != -1);
-		ml->v = newv[ml->v];
-
-		CustomData_copy_data(&dm->loopData, &cddm2->dm.loopData, oldl[i], i, 1);
-	}
-
-	/*copy vertex customdata*/
-	mv = mvert;
-	for (i = 0; i < cddm2->dm.numVertData; i++, mv++) {
-		CustomData_copy_data(&dm->vertData, &cddm2->dm.vertData, oldv[i], i, 1);
-	}
-
-	/*copy poly customdata*/
-	mp = mpoly;
-	for (i = 0; i < cddm2->dm.numPolyData; i++, mp++) {
-		CustomData_copy_data(&dm->polyData, &cddm2->dm.polyData, oldp[i], i, 1);
-	}
-
-	/*copy over data.  CustomData_add_layer can do this, need to look it up.*/
-	memcpy(cddm2->mvert, mvert, sizeof(MVert) * STACK_SIZE(mvert));
-	memcpy(cddm2->medge, medge, sizeof(MEdge) * STACK_SIZE(medge));
-	memcpy(cddm2->mloop, mloop, sizeof(MLoop) * STACK_SIZE(mloop));
-	memcpy(cddm2->mpoly, mpoly, sizeof(MPoly) * STACK_SIZE(mpoly));
-
-	MEM_freeN(mvert);
-	MEM_freeN(medge);
-	MEM_freeN(mloop);
-	MEM_freeN(mpoly);
-
-	MEM_freeN(newv);
-	MEM_freeN(newe);
-#ifdef USE_LOOPS
-	MEM_freeN(newl);
-#endif
-
-	MEM_freeN(oldv);
-	MEM_freeN(olde);
-	MEM_freeN(oldl);
-	MEM_freeN(oldp);
-
-	BLI_edgehash_free(ehash, NULL);
-
-	/*free old derivedmesh*/
-	dm->needsFree = 1;
-	dm->release(dm);
-
-	return (DerivedMesh *)cddm2;
-}
-#endif
-
 void CDDM_lower_num_verts(DerivedMesh *dm, int numVerts)
 {
 	BLI_assert(numVerts >= 0);
@@ -2029,20 +1352,6 @@ MPoly *CDDM_get_polys(DerivedMesh *dm)
 	return ((CDDerivedMesh *)dm)->mpoly;
 }
 
-void CDDM_tessfaces_to_faces(DerivedMesh *dm)
-{
-	/* converts mfaces to mpolys/mloops */
-	CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
-
-	BKE_mesh_convert_mfaces_to_mpolys_ex(
-	        NULL, &cddm->dm.faceData, &cddm->dm.loopData, &cddm->dm.polyData,
-	        cddm->dm.numEdgeData, cddm->dm.numTessFaceData,
-	        cddm->dm.numLoopData, cddm->dm.numPolyData,
-	        cddm->medge, cddm->mface,
-	        &cddm->dm.numLoopData, &cddm->dm.numPolyData,
-	        &cddm->mloop, &cddm->mpoly);
-}
-
 void CDDM_set_mvert(DerivedMesh *dm, MVert *mvert)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh *)dm;