- remove some unused editmesh functions.

- copy & rename EditMesh stricts for use with scanfill (remove unused members)

20 files changed, 16 insertions, 431 deletions

diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h
index 36760d387a1..06b4df8b05c 100644
--- a/source/blender/blenkernel/BKE_bmesh.h
+++ b/source/blender/blenkernel/BKE_bmesh.h
@@ -41,7 +41,6 @@
 #include "BLI_mempool.h"
 #include "BLI_memarena.h"
 #include "DNA_image_types.h"
-#include "BLI_editVert.h"
 #include "BKE_DerivedMesh.h"
 //XXX #include "transform.h"
 #include "bmesh.h"
@@ -250,9 +249,4 @@ void BME_free_transdata(struct BME_TransData_Head *td);
 float *BME_bevel_calc_polynormal(struct BME_Poly *f, struct BME_TransData_Head *td);
 struct BMesh *BME_bevel(struct BMEditMesh *em, float value, int res, int options, int defgrp_index, float angle, BME_TransData_Head **rtd);
 
-/*CONVERSION FUNCTIONS*/
-struct BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em);
-void   BME_bmesh_to_editmesh(struct BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em);
-struct BME_Mesh *BME_derivedmesh_to_bmesh(struct DerivedMesh *dm);
-struct DerivedMesh *BME_bmesh_to_derivedmesh(struct BME_Mesh *bm, struct DerivedMesh *dm);
 #endif
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 053749148a0..5fda391cd80 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -39,7 +39,6 @@
 
 struct DerivedMesh;
 struct BMEditMesh;
-struct EditMesh;
 struct Mesh;
 struct Object;
 
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 78354cd4713..c4f860e820f 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -39,7 +39,6 @@ extern "C" {
 
 struct ARegion;
 struct bScreen;
-struct EditMesh;
 struct ListBase;
 struct Main;
 struct Object;
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 6159240f92d..e5e172accca 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -178,13 +178,9 @@ void CustomData_copy_data(const struct CustomData *source,
 						  struct CustomData *dest, int source_index,
 						  int dest_index, int count);
 void CustomData_copy_elements(int type, void *source, void *dest, int count);
-void CustomData_em_copy_data(const struct CustomData *source,
-							struct CustomData *dest, void *src_block,
-							void **dest_block);
 void CustomData_bmesh_copy_data(const struct CustomData *source, 
                                 struct CustomData *dest, void *src_block, 
                                 void **dest_block);
-void CustomData_em_validate_data(struct CustomData *data, void *block, int sub_elements);
 
 /* frees data in a CustomData object
  * return 1 on success, 0 on failure
@@ -208,9 +204,6 @@ void CustomData_free_elem(struct CustomData *data, int index, int count);
 void CustomData_interp(const struct CustomData *source, struct CustomData *dest,
 					   int *src_indices, float *weights, float *sub_weights,
 					   int count, int dest_index);
-void CustomData_em_interp(struct CustomData *data,  void **src_blocks,
-						  float *weights, float *sub_weights, int count,
-						  void *dest_block);
 void CustomData_bmesh_interp(struct CustomData *data, void **src_blocks, 
 							 float *weights, float *sub_weights, int count, 
 							 void *dest_block);
@@ -226,8 +219,6 @@ void CustomData_swap(struct CustomData *data, int index, const int *corner_indic
  */
 void *CustomData_get(const struct CustomData *data, int index, int type);
 void *CustomData_get_n(const struct CustomData *data, int type, int index, int n);
-void *CustomData_em_get(const struct CustomData *data, void *block, int type);
-void *CustomData_em_get_n(const struct CustomData *data, void *block, int type, int n);
 void *CustomData_bmesh_get(const struct CustomData *data, void *block, int type);
 void *CustomData_bmesh_get_n(const struct CustomData *data, void *block, int type, int n);
 
@@ -263,10 +254,6 @@ int CustomData_get_stencil_layer(const struct CustomData *data, int type);
  */
 void CustomData_set(const struct CustomData *data, int index, int type,
 					void *source);
-void CustomData_em_set(struct CustomData *data, void *block, int type,
-					   void *source);
-void CustomData_em_set_n(struct CustomData *data, void *block, int type, int n,
-						 void *source);
 
 void CustomData_bmesh_set(const struct CustomData *data, void *block, int type, 
 						  void *source);
@@ -300,10 +287,6 @@ void CustomData_set_layer_stencil_index(struct CustomData *data, int type, int n
 /* adds flag to the layer flags */
 void CustomData_set_layer_flag(struct CustomData *data, int type, int flag);
 
-/* alloc/free a block of custom data attached to one element in editmode */
-void CustomData_em_set_default(struct CustomData *data, void **block);
-void CustomData_em_free_block(struct CustomData *data, void **block);
-
 void CustomData_bmesh_set_default(struct CustomData *data, void **block);
 void CustomData_bmesh_free_block(struct CustomData *data, void **block);
 
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h
index f43ec749a69..5a36add2834 100644
--- a/source/blender/blenkernel/BKE_displist.h
+++ b/source/blender/blenkernel/BKE_displist.h
@@ -63,7 +63,6 @@ struct ListBase;
 struct Material;
 struct Bone;
 struct Mesh;
-struct EditMesh;
 struct DerivedMesh;
 
 /* used for curves, nurbs, mball, importing */
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index f3307b73187..de4f0a7eac6 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -35,7 +35,6 @@
 #include "BKE_customdata.h"
 
 struct ID;
-struct EditMesh;
 struct DerivedMesh;
 struct DagForest;
 struct DagNode;
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index cf77ea85c15..35de1c21a54 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -34,7 +34,6 @@
 struct DMGridAdjacency;
 struct DMGridData;
 struct DerivedMesh;
-struct EditMesh;
 struct IndexNode;
 struct ListBase;
 struct Mesh;
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 573edb78687..7e491ff5f7c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -37,13 +37,13 @@
 
 #include "DNA_cloth_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h" // N_T
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_array.h"
@@ -761,7 +761,7 @@ static float *get_editbmesh_orco_verts(BMEditMesh *em)
 
 	totvert= em->bm->totvert;
 	
-	orco = MEM_mallocN(sizeof(float)*3*totvert, "EditMesh Orco");
+	orco = MEM_mallocN(sizeof(float)*3*totvert, "BMEditMesh Orco");
 
 	eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
 	for (a=0; eve; eve=BM_iter_step(&iter), a+=3) {
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 11700d7f072..bfafd96b95e 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -37,7 +37,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
@@ -46,6 +45,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_group_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 5c50c14f1a8..f4416b8f5d6 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -36,7 +36,6 @@
 
 #include "DNA_meshdata_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 #include "BLI_linklist.h"
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 2be23e1f182..9f3c9fc8b78 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -43,12 +43,10 @@
 #include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 
-#include "BLI_editVert.h"
 #include "BLI_scanfill.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_array.h"
@@ -61,6 +59,7 @@
 #include "BKE_paint.h"
 
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h" /* for Curve */
@@ -1793,104 +1792,6 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *UNUSED(ob))
 	return dm;
 }
 
-static DerivedMesh *UNUSED_FUNCTION(CDDM_from_editmesh)(EditMesh *em, Mesh *UNUSED(me))
-{
-	DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
-	                           BLI_countlist(&em->edges),
-	                           BLI_countlist(&em->faces), 0, 0);
-	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
-	EditVert *eve;
-	EditEdge *eed;
-	EditFace *efa;
-	MVert *mvert = cddm->mvert;
-	MEdge *medge = cddm->medge;
-	MFace *mface = cddm->mface;
-	int i, *index;
-
-	dm->deformedOnly = 1;
-
-	CustomData_merge(&em->vdata, &dm->vertData, CD_MASK_DERIVEDMESH,
-					 CD_CALLOC, dm->numVertData);
-	/* CustomData_merge(&em->edata, &dm->edgeData, CD_MASK_DERIVEDMESH,
-					 CD_CALLOC, dm->numEdgeData); */
-	CustomData_merge(&em->fdata, &dm->faceData, CD_MASK_DERIVEDMESH,
-					 CD_CALLOC, dm->numTessFaceData);
-	CustomData_merge(&em->fdata, &dm->faceData, CD_MASK_DERIVEDMESH,
-	                 CD_CALLOC, dm->numTessFaceData);
-
-	/* set eve->hash to vert index */
-	for(i = 0, eve = em->verts.first; eve; eve = eve->next, ++i)
-		eve->tmp.l = i;
-
-	/* Need to be able to mark loose edges */
-	for(eed = em->edges.first; eed; eed = eed->next) {
-		eed->f2 = 0;
-	}
-	for(efa = em->faces.first; efa; efa = efa->next) {
-		efa->e1->f2 = 1;
-		efa->e2->f2 = 1;
-		efa->e3->f2 = 1;
-		if(efa->e4) efa->e4->f2 = 1;
-	}
-
-	index = dm->getVertDataArray(dm, CD_ORIGINDEX);
-	for(i = 0, eve = em->verts.first; i < dm->numVertData;
-		i++, eve = eve->next, index++) {
-		MVert *mv = &mvert[i];
-
-		copy_v3_v3(mv->co, eve->co);
-
-		normal_float_to_short_v3(mv->no, eve->no);
-		mv->bweight = (unsigned char) (eve->bweight * 255.0f);
-
-		mv->flag = 0;
-
-		*index = i;
-
-		CustomData_from_em_block(&em->vdata, &dm->vertData, eve->data, i);
-	}
-
-	index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
-	for(i = 0, eed = em->edges.first; i < dm->numEdgeData;
-		i++, eed = eed->next, index++) {
-		MEdge *med = &medge[i];
-
-		med->v1 = eed->v1->tmp.l;
-		med->v2 = eed->v2->tmp.l;
-		med->crease = (unsigned char) (eed->crease * 255.0f);
-		med->bweight = (unsigned char) (eed->bweight * 255.0f);
-		med->flag = ME_EDGEDRAW|ME_EDGERENDER;
-		
-		if(eed->seam) med->flag |= ME_SEAM;
-		if(eed->sharp) med->flag |= ME_SHARP;
-		if(!eed->f2) med->flag |= ME_LOOSEEDGE;
-
-		*index = i;
-
-		/* CustomData_from_em_block(&em->edata, &dm->edgeData, eed->data, i); */
-	}
-
-	index = dm->getTessFaceDataArray(dm, CD_POLYINDEX);
-	for(i = 0, efa = em->faces.first; i < dm->numTessFaceData;
-		i++, efa = efa->next, index++) {
-		MFace *mf = &mface[i];
-
-		mf->v1 = efa->v1->tmp.l;
-		mf->v2 = efa->v2->tmp.l;
-		mf->v3 = efa->v3->tmp.l;
-		mf->v4 = efa->v4 ? efa->v4->tmp.l : 0;
-		mf->mat_nr = efa->mat_nr;
-		mf->flag = efa->flag;
-
-		*index = i;
-
-		CustomData_from_em_block(&em->fdata, &dm->faceData, efa->data, i);
-		test_index_face(mf, &dm->faceData, i, efa->v4?4:3);
-	}
-
-	return dm;
-}
-
 DerivedMesh *CDDM_from_curve(Object *ob)
 {
 	return CDDM_from_curve_customDB(ob, &ob->disp);
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 4f3fc40616b..833f14ff074 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -40,7 +40,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index a4c1fd87009..6cb8b65dbaf 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2154,287 +2154,6 @@ void CustomData_set(const CustomData *data, int index, int type, void *source)
 		memcpy(dest, source, typeInfo->size);
 }
 
-/* EditMesh functions */
-
-void CustomData_em_free_block(CustomData *data, void **block)
-{
-	const LayerTypeInfo *typeInfo;
-	int i;
-
-	if(!*block) return;
-
-	for(i = 0; i < data->totlayer; ++i) {
-		if(!(data->layers[i].flag & CD_FLAG_NOFREE)) {
-			typeInfo = layerType_getInfo(data->layers[i].type);
-
-			if(typeInfo->free) {
-				int offset = data->layers[i].offset;
-				typeInfo->free((char*)*block + offset, 1, typeInfo->size);
-			}
-		}
-	}
-
-	MEM_freeN(*block);
-	*block = NULL;
-}
-
-static void CustomData_em_alloc_block(CustomData *data, void **block)
-{
-	/* TODO: optimize free/alloc */
-
-	if (*block)
-		CustomData_em_free_block(data, block);
-
-	if (data->totsize > 0)
-		*block = MEM_callocN(data->totsize, "CustomData EM block");
-	else
-		*block = NULL;
-}
-
-void CustomData_em_copy_data(const CustomData *source, CustomData *dest,
-							void *src_block, void **dest_block)
-{
-	const LayerTypeInfo *typeInfo;
-	int dest_i, src_i;
-
-	if (!*dest_block)
-		CustomData_em_alloc_block(dest, dest_block);
-	
-	/* copies a layer at a time */
-	dest_i = 0;
-	for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-		/* find the first dest layer with type >= the source type
-		 * (this should work because layers are ordered by type)
-		 */
-		while(dest_i < dest->totlayer
-			  && dest->layers[dest_i].type < source->layers[src_i].type)
-			++dest_i;
-
-		/* if there are no more dest layers, we're done */
-		if(dest_i >= dest->totlayer) return;
-
-		/* if we found a matching layer, copy the data */
-		if(dest->layers[dest_i].type == source->layers[src_i].type &&
-			strcmp(dest->layers[dest_i].name, source->layers[src_i].name) == 0) {
-			char *src_data = (char*)src_block + source->layers[src_i].offset;
-			char *dest_data = (char*)*dest_block + dest->layers[dest_i].offset;
-
-			typeInfo = layerType_getInfo(source->layers[src_i].type);
-
-			if(typeInfo->copy)
-				typeInfo->copy(src_data, dest_data, 1);
-			else
-				memcpy(dest_data, src_data, typeInfo->size);
-
-			/* if there are multiple source & dest layers of the same type,
-			 * we don't want to copy all source layers to the same dest, so
-			 * increment dest_i
-			 */
-			++dest_i;
-		}
-	}
-}
-
-void CustomData_em_validate_data(CustomData *data, void *block, int sub_elements)
-{
-	int i;
-	for(i = 0; i < data->totlayer; i++) {
-		const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[i].type);
-		char *leayer_data = (char*)block + data->layers[i].offset;
-
-		if(typeInfo->validate)
-			typeInfo->validate(leayer_data, sub_elements);
-	}
-}
-
-void *CustomData_em_get(const CustomData *data, void *block, int type)
-{
-	int layer_index;
-	
-	/* get the layer index of the first layer of type */
-	layer_index = CustomData_get_active_layer_index(data, type);
-	if(layer_index < 0) return NULL;
-
-	return (char *)block + data->layers[layer_index].offset;
-}
-
-void *CustomData_em_get_n(const CustomData *data, void *block, int type, int n)
-{
-	int layer_index;
-	
-	/* get the layer index of the first layer of type */
-	layer_index = CustomData_get_layer_index_n(data, type, n);
-	if(layer_index < 0) return NULL;
-
-	return (char *)block + data->layers[layer_index].offset;
-}
-
-void CustomData_em_set(CustomData *data, void *block, int type, void *source)
-{
-	void *dest = CustomData_em_get(data, block, type);
-	const LayerTypeInfo *typeInfo = layerType_getInfo(type);
-
-	if(!dest) return;
-
-	if(typeInfo->copy)
-		typeInfo->copy(source, dest, 1);
-	else
-		memcpy(dest, source, typeInfo->size);
-}
-
-void CustomData_em_set_n(CustomData *data, void *block, int type, int n, void *source)
-{
-	void *dest = CustomData_em_get_n(data, block, type, n);
-	const LayerTypeInfo *typeInfo = layerType_getInfo(type);
-
-	if(!dest) return;
-
-	if(typeInfo->copy)
-		typeInfo->copy(source, dest, 1);
-	else
-		memcpy(dest, source, typeInfo->size);
-}
-
-void CustomData_em_interp(CustomData *data, void **src_blocks, float *weights,
-						  float *sub_weights, int count, void *dest_block)
-{
-	int i, j;
-	void *source_buf[SOURCE_BUF_SIZE];
-	void **sources = source_buf;
-
-	/* slow fallback in case we're interpolating a ridiculous number of
-	 * elements
-	 */
-	if(count > SOURCE_BUF_SIZE)
-		sources = MEM_callocN(sizeof(*sources) * count,
-							  "CustomData_interp sources");
-
-	/* interpolates a layer at a time */
-	for(i = 0; i < data->totlayer; ++i) {
-		CustomDataLayer *layer = &data->layers[i];
-		const LayerTypeInfo *typeInfo = layerType_getInfo(layer->type);
-
-		if(typeInfo->interp) {
-			for(j = 0; j < count; ++j)
-				sources[j] = (char *)src_blocks[j] + layer->offset;
-
-			typeInfo->interp(sources, weights, sub_weights, count,
-							  (char *)dest_block + layer->offset);
-		}
-	}
-
-	if(count > SOURCE_BUF_SIZE) MEM_freeN(sources);
-}
-
-void CustomData_em_set_default(CustomData *data, void **block)
-{
-	const LayerTypeInfo *typeInfo;
-	int i;
-
-	if (!*block)
-		CustomData_em_alloc_block(data, block);
-
-	for(i = 0; i < data->totlayer; ++i) {
-		int offset = data->layers[i].offset;
-
-		typeInfo = layerType_getInfo(data->layers[i].type);
-
-		if(typeInfo->set_default)
-			typeInfo->set_default((char*)*block + offset, 1);
-	}
-}
-
-void CustomData_to_em_block(const CustomData *source, CustomData *dest,
-							int src_index, void **dest_block)
-{
-	const LayerTypeInfo *typeInfo;
-	int dest_i, src_i, src_offset;
-
-	if (!*dest_block)
-		CustomData_em_alloc_block(dest, dest_block);
-	
-	/* copies a layer at a time */
-	dest_i = 0;
-	for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-		/* find the first dest layer with type >= the source type
-		 * (this should work because layers are ordered by type)
-		 */
-		while(dest_i < dest->totlayer
-			  && dest->layers[dest_i].type < source->layers[src_i].type)
-			++dest_i;
-
-		/* if there are no more dest layers, we're done */
-		if(dest_i >= dest->totlayer) return;
-
-		/* if we found a matching layer, copy the data */
-		if(dest->layers[dest_i].type == source->layers[src_i].type) {
-			int offset = dest->layers[dest_i].offset;
-			char *src_data = source->layers[src_i].data;
-			char *dest_data = (char*)*dest_block + offset;
-
-			typeInfo = layerType_getInfo(dest->layers[dest_i].type);
-			src_offset = src_index * typeInfo->size;
-
-			if(typeInfo->copy)
-				typeInfo->copy(src_data + src_offset, dest_data, 1);
-			else
-				memcpy(dest_data, src_data + src_offset, typeInfo->size);
-
-			/* if there are multiple source & dest layers of the same type,
-			 * we don't want to copy all source layers to the same dest, so
-			 * increment dest_i
-			 */
-			++dest_i;
-		}
-	}
-}
-
-void CustomData_from_em_block(const CustomData *source, CustomData *dest,
-							  void *src_block, int dest_index)
-{
-	const LayerTypeInfo *typeInfo;
-	int dest_i, src_i, dest_offset;
-
-	/* copies a layer at a time */
-	dest_i = 0;
-	for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-		/* find the first dest layer with type >= the source type
-		 * (this should work because layers are ordered by type)
-		 */
-		while(dest_i < dest->totlayer
-			  && dest->layers[dest_i].type < source->layers[src_i].type)
-			++dest_i;
-
-		/* if there are no more dest layers, we're done */
-		if(dest_i >= dest->totlayer) return;
-
-		/* if we found a matching layer, copy the data */
-		if(dest->layers[dest_i].type == source->layers[src_i].type) {
-			int offset = source->layers[src_i].offset;
-			char *src_data = (char*)src_block + offset;
-			char *dest_data = dest->layers[dest_i].data;
-
-			typeInfo = layerType_getInfo(dest->layers[dest_i].type);
-			dest_offset = dest_index * typeInfo->size;
-
-			if(typeInfo->copy)
-				typeInfo->copy(src_data, dest_data + dest_offset, 1);
-			else
-				memcpy(dest_data + dest_offset, src_data, typeInfo->size);
-
-			/* if there are multiple source & dest layers of the same type,
-			 * we don't want to copy all source layers to the same dest, so
-			 * increment dest_i
-			 */
-			++dest_i;
-		}
-	}
-
-}
-
 /*Bmesh functions*/
 /*needed to convert to/from different face reps*/
 void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata,
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 2a971c45232..3a67c66165a 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -44,7 +44,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_scanfill.h"
 #include "BLI_utildefines.h"
 
@@ -417,8 +416,8 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase, i
 
 void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
 {
-	EditVert *eve, *v1, *vlast;
-	EditFace *efa;
+	ScanFillVert *eve, *v1, *vlast;
+	ScanFillFace *efa;
 	DispList *dlnew=NULL, *dl;
 	float *f1;
 	int colnr=0, charidx=0, cont=1, tot, a, *index, nextcol= 0;
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index ee06600dab6..766febc0603 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -38,7 +38,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 
@@ -191,9 +190,9 @@ static void BMEdit_RecalcTesselation_intern(BMEditMesh *tm)
 #endif /* USE_TESSFACE_SPEEDUP */
 
 		else {
-			EditVert *v, *lastv=NULL, *firstv=NULL;
-			EditEdge *e;
-			EditFace *efa;
+			ScanFillVert *v, *lastv=NULL, *firstv=NULL;
+			ScanFillEdge *e;
+			ScanFillFace *efa;
 			int totfilltri;
 
 			BLI_begin_edgefill();
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 84af6200f94..1b678225135 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -37,13 +37,13 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 05c90bf4d0c..87172226ffa 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -39,6 +39,7 @@
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_customdata_types.h"
@@ -46,7 +47,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_scanfill.h"
@@ -71,7 +71,6 @@
 #include "BLI_edgehash.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
 #include "BLI_edgehash.h"
@@ -461,7 +460,7 @@ Mesh *add_mesh(const char *name)
 	
 	me->size[0]= me->size[1]= me->size[2]= 1.0;
 	me->smoothresh= 30;
-	me->texflag= AUTOSPACE;
+	me->texflag= ME_AUTOSPACE;
 	me->flag= ME_TWOSIDED;
 	me->bb= unit_boundbox();
 	me->drawflag= ME_DRAWEDGES|ME_DRAWFACES|ME_DRAWCREASES;
@@ -658,7 +657,7 @@ void tex_space_mesh(Mesh *me)
 
 	boundbox_mesh(me, loc, size);
 
-	if(me->texflag & AUTOSPACE) {
+	if (me->texflag & ME_AUTOSPACE) {
 		for (a=0; a<3; a++) {
 			if(size[a]==0.0f) size[a]= 1.0f;
 			else if(size[a]>0.0f && size[a]<0.00001f) size[a]= 0.00001f;
@@ -2252,8 +2251,8 @@ int mesh_recalcTesselation(CustomData *fdata,
 	MLoop *ml, *mloop;
 	MFace *mface = NULL, *mf;
 	BLI_array_declare(mface);
-	EditVert *v, *lastv, *firstv;
-	EditFace *f;
+	ScanFillVert *v, *lastv, *firstv;
+	ScanFillFace *f;
 	int *mface_orig_index = NULL;
 	BLI_array_declare(mface_orig_index);
 	int *mface_to_poly_map = NULL;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 1f154e17492..e7320ddf5dc 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -43,7 +43,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 3d8729bc788..00aa5d96bab 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -45,6 +45,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
@@ -58,7 +59,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 53c7656663a..84513f83204 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -43,7 +43,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"