1 files changed, 1 insertions, 702 deletions

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index f62cff8fc0d..cfa60c04127 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -35,46 +35,27 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_vec_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BIF_editmesh.h"
-
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
 #include "BKE_object.h"
 #include "BKE_subsurf.h"
 
 #include "blendef.h"
-#include "editmesh.h"
 
 #include <math.h>
 #include <string.h>
 
-/* Returns the active multires level (currently applied to the mesh) */
-MultiresLevel *current_level(Multires *mr)
-{
-	return BLI_findlink(&mr->levels, mr->current - 1);
-}
-
-/* Returns the nth multires level, starting at 1 */
-MultiresLevel *multires_level_n(Multires *mr, int n)
-{
-	if(mr)
-		return BLI_findlink(&mr->levels, n - 1);
-	else
-		return NULL;
-}
-
 /* Does not actually free lvl itself */
 void multires_free_level(MultiresLevel *lvl)
 {
@@ -111,688 +92,6 @@ void multires_free(Multires *mr)
 	}
 }
 
-static MultiresLevel *multires_level_copy(MultiresLevel *orig)
-{
-	if(orig) {
-		MultiresLevel *lvl= MEM_dupallocN(orig);
-		
-		lvl->next= lvl->prev= NULL;
-		lvl->faces= MEM_dupallocN(orig->faces);
-		lvl->colfaces= MEM_dupallocN(orig->colfaces);
-		lvl->edges= MEM_dupallocN(orig->edges);
-		
-		return lvl;
-	}
-	return NULL;
-}
-
-Multires *multires_copy(Multires *orig)
-{
-	const CustomDataMask vdata_mask= CD_MASK_MDEFORMVERT;
-
-	if(orig) {
-		Multires *mr= MEM_dupallocN(orig);
-		MultiresLevel *lvl;
-		
-		mr->levels.first= mr->levels.last= NULL;
-		
-		for(lvl= orig->levels.first; lvl; lvl= lvl->next)
-			BLI_addtail(&mr->levels, multires_level_copy(lvl));
-
-		mr->verts= MEM_dupallocN(orig->verts);
-		
-		lvl= mr->levels.first;
-		if(lvl) {
-			CustomData_copy(&orig->vdata, &mr->vdata, vdata_mask, CD_DUPLICATE, lvl->totvert);
-			CustomData_copy(&orig->fdata, &mr->fdata, CD_MASK_MTFACE, CD_DUPLICATE, lvl->totface);
-			mr->edge_flags= MEM_dupallocN(orig->edge_flags);
-			mr->edge_creases= MEM_dupallocN(orig->edge_creases);
-		}
-		
-		return mr;
-	}
-	return NULL;
-}
-
-static void multires_get_vert(MVert *out, EditVert *eve, MVert *m, int i)
-{
-	if(eve) {
-		VecCopyf(out->co, eve->co);
-		out->flag= 0;
-		if(eve->f & SELECT) out->flag |= 1;
-		if(eve->h) out->flag |= ME_HIDE;
-		eve->tmp.l= i;
-	}
-	else
-		*out= *m;
-}
-
-void eed_to_medge_flag(EditEdge *eed, short *flag, char *crease)
-{
-	if(!eed || !flag) return;
-
-	/* Would be nice if EditMesh edge flags could be unified with Mesh flags! */
-	*flag= (eed->f & SELECT) | ME_EDGERENDER;
-	if(eed->f2<2) *flag |= ME_EDGEDRAW;
-	if(eed->f2==0) *flag |= ME_LOOSEEDGE;
-	if(eed->sharp) *flag |= ME_SHARP;
-	if(eed->seam) *flag |= ME_SEAM;
-	if(eed->h & EM_FGON) *flag |= ME_FGON;
-	if(eed->h & 1) *flag |= ME_HIDE;
-	
-	*crease= (char)(255.0*eed->crease);
-}
-
-static void multires_get_edge(MultiresEdge *e, EditEdge *eed, MEdge *m, short *flag, char *crease)
-{
-	if(eed) {
-		e->v[0]= eed->v1->tmp.l;
-		e->v[1]= eed->v2->tmp.l;
-		eed_to_medge_flag(eed, flag, crease);
-	} else {		
-		e->v[0]= m->v1;
-		e->v[1]= m->v2;
-		*flag= m->flag;
-		*crease= m->crease;
-	}
-}
-
-static void multires_get_face(MultiresFace *f, EditFace *efa, MFace *m)
-{
-	if(efa) {
-		MFace tmp;
-		int j;
-		tmp.v1= efa->v1->tmp.l;
-		tmp.v2= efa->v2->tmp.l;
-		tmp.v3= efa->v3->tmp.l;
-		tmp.v4= 0;
-		if(efa->v4) tmp.v4= efa->v4->tmp.l;
-		test_index_face(&tmp, NULL, 0, efa->v4?4:3);
-		for(j=0; j<4; ++j) f->v[j]= (&tmp.v1)[j];
-
-		/* Flags */
-		f->flag= efa->flag;
-		if(efa->f & 1) f->flag |= ME_FACE_SEL;
-		else f->flag &= ~ME_FACE_SEL;
-		if(efa->h) f->flag |= ME_HIDE;
-		f->mat_nr= efa->mat_nr;
-	} else {		
-		f->v[0]= m->v1;
-		f->v[1]= m->v2;
-		f->v[2]= m->v3;
-		f->v[3]= m->v4;
-		f->flag= m->flag;
-		f->mat_nr= m->mat_nr;
-	}
-}
-
-/* For manipulating vertex colors / uvs */
-static void mcol_to_multires(MultiresColFace *mrf, MCol *mcol)
-{
-	char i;
-	for(i=0; i<4; ++i) {
-		mrf->col[i].a= mcol[i].a;
-		mrf->col[i].r= mcol[i].r;
-		mrf->col[i].g= mcol[i].g;
-		mrf->col[i].b= mcol[i].b;
-	}
-}
-
-/* 1 <= count <= 4 */
-static void multires_col_avg(MultiresCol *avg, MultiresCol cols[4], char count)
-{
-	unsigned i;
-	avg->a= avg->r= avg->g= avg->b= 0;
-	for(i=0; i<count; ++i) {
-		avg->a+= cols[i].a;
-		avg->r+= cols[i].r;
-		avg->g+= cols[i].g;
-		avg->b+= cols[i].b;
-	}
-	avg->a/= count;
-	avg->r/= count;
-	avg->g/= count;
-	avg->b/= count;
-}
-
-static void multires_col_avg2(MultiresCol *avg, MultiresCol *c1, MultiresCol *c2)
-{
-	MultiresCol in[2];
-	in[0]= *c1;
-	in[1]= *c2;
-	multires_col_avg(avg,in,2);
-}
-
-void multires_load_cols(Mesh *me)
-{
-	MultiresLevel *lvl= BLI_findlink(&me->mr->levels,me->mr->current-1), *cur;
-	EditMesh *em= G.obedit ? G.editMesh : NULL;
-	CustomData *src= em ? &em->fdata : &me->fdata;
-	EditFace *efa= NULL;
-	unsigned i,j;
-
-	if(!CustomData_has_layer(src, CD_MCOL) && !CustomData_has_layer(src, CD_MTFACE)) return;
-
-	/* Add texcol data */
-	for(cur= me->mr->levels.first; cur; cur= cur->next)
-		if(!cur->colfaces)
-			cur->colfaces= MEM_callocN(sizeof(MultiresColFace)*cur->totface,"ColFaces");
-
-	me->mr->use_col= CustomData_has_layer(src, CD_MCOL);
-
-	if(em) efa= em->faces.first;
-	for(i=0; i<lvl->totface; ++i) {
-		MultiresColFace *f= &lvl->colfaces[i];
-
-		if(me->mr->use_col)
-			mcol_to_multires(f, em ? CustomData_em_get(src, efa->data, CD_MCOL) : &me->mcol[i*4]);
-		
-		if(em) efa= efa->next;
-	}
-
-	/* Update higher levels */
-	lvl= lvl->next;
-	while(lvl) {
-		MultiresColFace *cf= lvl->colfaces;
-		for(i=0; i<lvl->prev->totface; ++i) {
-			const char sides= lvl->prev->faces[i].v[3]?4:3;
-			MultiresCol cntr;
-			
-			/* Find average color of 4 (or 3 for triangle) verts */
-			multires_col_avg(&cntr,lvl->prev->colfaces[i].col,sides);
-			
-			for(j=0; j<sides; ++j) {
-				MultiresColFace *pf= &lvl->prev->colfaces[i];
-
-				multires_col_avg2(&cf->col[0],
-						  &pf->col[j],
-						  &pf->col[j==0?sides-1:j-1]);
-				cf->col[1]= pf->col[j];
-				multires_col_avg2(&cf->col[2],
-						  &pf->col[j],
-						  &pf->col[j==sides-1?0:j+1]);
-				cf->col[3]= cntr;
-				
-				++cf;
-			}
-		}
-		lvl= lvl->next;
-	}
-
-	/* Update lower levels */
-	lvl= me->mr->levels.last;
-	lvl= lvl->prev;
-	while(lvl) {
-		unsigned curf= 0;
-		for(i=0; i<lvl->totface; ++i) {
-			MultiresFace *f= &lvl->faces[i];
-			for(j=0; j<(f->v[3]?4:3); ++j) {
-				lvl->colfaces[i].col[j]= lvl->next->colfaces[curf].col[1];
-				++curf;
-			}
-		}
-		lvl= lvl->prev;
-	}
-}
-
-void multires_create(Object *ob, Mesh *me)
-{
-	MultiresLevel *lvl;
-	EditMesh *em= G.obedit ? G.editMesh : NULL;
-	EditVert *eve= NULL;
-	EditFace *efa= NULL;
-	EditEdge *eed= NULL;
-	int i;
-	
-	lvl= MEM_callocN(sizeof(MultiresLevel), "multires level");
-
-	if(me->pv) mesh_pmv_off(ob, me);
-
-	me->mr= MEM_callocN(sizeof(Multires), "multires data");
-	
-	BLI_addtail(&me->mr->levels,lvl);
-	me->mr->current= 1;
-	me->mr->level_count= 1;
-	me->mr->edgelvl= 1;
-	me->mr->pinlvl= 1;
-	me->mr->renderlvl= 1;
-	
-	/* Load mesh (or editmesh) into multires data */
-
-	/* Load vertices and vdata (MDeformVerts) */
-	lvl->totvert= em ? BLI_countlist(&em->verts) : me->totvert;
-	me->mr->verts= MEM_callocN(sizeof(MVert)*lvl->totvert,"multires verts");
-	multires_update_customdata(me->mr->levels.first, em, em ? &em->vdata : &me->vdata,
-	                           &me->mr->vdata, CD_MDEFORMVERT);
-	if(em) eve= em->verts.first;
-	for(i=0; i<lvl->totvert; ++i) {
-		multires_get_vert(&me->mr->verts[i], eve, &me->mvert[i], i);
-		if(em) eve= eve->next;
-	}
-
-	/* Load faces and fdata (MTFaces) */
-	lvl->totface= em ? BLI_countlist(&em->faces) : me->totface;
-	lvl->faces= MEM_callocN(sizeof(MultiresFace)*lvl->totface,"multires faces");
-	multires_update_customdata(me->mr->levels.first, em, em ? &em->fdata : &me->fdata,
-	                           &me->mr->fdata, CD_MTFACE);
-	if(em) efa= em->faces.first;
-	for(i=0; i<lvl->totface; ++i) {
-		multires_get_face(&lvl->faces[i], efa, &me->mface[i]);
-		if(em) efa= efa->next;
-	}
-
-	/* Load edges and edge_flags */
-	lvl->totedge= em ? BLI_countlist(&em->edges) : me->totedge;
-	lvl->edges= MEM_callocN(sizeof(MultiresEdge)*lvl->totedge,"multires edges");
-	me->mr->edge_flags= MEM_callocN(sizeof(short)*lvl->totedge, "multires edge flags");
-	me->mr->edge_creases= MEM_callocN(sizeof(short)*lvl->totedge, "multires edge creases");
-	if(em) eed= em->edges.first;
-	for(i=0; i<lvl->totedge; ++i) {
-		multires_get_edge(&lvl->edges[i], eed, &me->medge[i], &me->mr->edge_flags[i], &me->mr->edge_creases[i]);
-		if(em) eed= eed->next;
-	}
-
-	multires_load_cols(me);
-}
-
-typedef struct MultiresMapNode {
-	struct MultiresMapNode *next, *prev;
-	unsigned Index;
-} MultiresMapNode;
-
-/* CATMULL-CLARK
-   ============= */
-
-typedef struct MultiApplyData {
-	/* Smooth faces */
-	float *corner1, *corner2, *corner3, *corner4;
-	char quad;
-
-	/* Smooth edges */
-	char boundary;
-	float edge_face_neighbor_midpoints_accum[3];
-	unsigned edge_face_neighbor_midpoints_total;
-	float *endpoint1, *endpoint2;
-
-	/* Smooth verts */
-	/* uses 'char boundary' */
-	float *original;
-	int edge_count;
-	float vert_face_neighbor_midpoints_average[3];
-	float vert_edge_neighbor_midpoints_average[3];
-	float boundary_edges_average[3];
-} MultiApplyData;
-
-/* END CATMULL-CLARK
-   ================= */
-
-static void multires_update_faces(Mesh *me, EditMesh *em)
-{
-	MultiresLevel *cr_lvl= current_level(me->mr), *pr_lvl= NULL,
-		      *last_lvl= me->mr->levels.last;
-	char *pr_flag_damaged= NULL, *cr_flag_damaged= NULL, *or_flag_damaged= NULL,
-	     *pr_mat_damaged= NULL, *cr_mat_damaged= NULL, *or_mat_damaged= NULL, *swap= NULL;
-	EditFace *efa= NULL;
-	unsigned i,j,curf;
-
-	/* Find for each face whether flag/mat has changed */
-	pr_flag_damaged= MEM_callocN(sizeof(char) * last_lvl->totface, "flag_damaged 1");
-	cr_flag_damaged= MEM_callocN(sizeof(char) * last_lvl->totface, "flag_damaged 1");
-	pr_mat_damaged= MEM_callocN(sizeof(char) * last_lvl->totface, "mat_damaged 1");
-	cr_mat_damaged= MEM_callocN(sizeof(char) * last_lvl->totface, "mat_damaged 1");
-	if(em) efa= em->faces.first;
-	for(i=0; i<cr_lvl->totface; ++i) {
-		MultiresFace mftmp;
-		multires_get_face(&mftmp, efa, &me->mface[i]);
-		if(cr_lvl->faces[i].flag != mftmp.flag)
-			cr_flag_damaged[i]= 1;
-		if(cr_lvl->faces[i].mat_nr != mftmp.mat_nr)
-			cr_mat_damaged[i]= 1;
-
-		/* Update current level */
-		cr_lvl->faces[i].flag= mftmp.flag;
-		cr_lvl->faces[i].mat_nr= mftmp.mat_nr;
-
-		if(em) efa= efa->next;
-	}
-	or_flag_damaged= MEM_dupallocN(cr_flag_damaged);
-	or_mat_damaged= MEM_dupallocN(cr_mat_damaged);
-
-	/* Update lower levels */
-	cr_lvl= cr_lvl->prev;
-	while(cr_lvl) {
-		swap= pr_flag_damaged;
-		pr_flag_damaged= cr_flag_damaged;
-		cr_flag_damaged= swap;
-
-		swap= pr_mat_damaged;
-		pr_mat_damaged= cr_mat_damaged;
-		cr_mat_damaged= swap;
-
-		curf= 0;
-		for(i=0; i<cr_lvl->totface; ++i) {
-			const int sides= cr_lvl->faces[i].v[3] ? 4 : 3;
-			
-			/* Check damages */
-			for(j=0; j<sides; ++j, ++curf) {
-				if(pr_flag_damaged[curf]) {
-					cr_lvl->faces[i].flag= cr_lvl->next->faces[curf].flag;
-					cr_flag_damaged[i]= 1;
-				}
-				if(pr_mat_damaged[curf]) {
-					cr_lvl->faces[i].mat_nr= cr_lvl->next->faces[curf].mat_nr;
-					cr_mat_damaged[i]= 1;
-				}
-			}
-		}
-
-		cr_lvl= cr_lvl->prev;
-	}
-	
-	/* Clear to original damages */
-	if(cr_flag_damaged) MEM_freeN(cr_flag_damaged);
-	if(cr_mat_damaged) MEM_freeN(cr_mat_damaged);
-	cr_flag_damaged= or_flag_damaged;
-	cr_mat_damaged= or_mat_damaged;
-	
-	/* Update higher levels */
-	pr_lvl= current_level(me->mr);
-	cr_lvl= pr_lvl->next;
-	while(cr_lvl) {
-		swap= pr_flag_damaged;
-		pr_flag_damaged= cr_flag_damaged;
-		cr_flag_damaged= swap;
-
-		swap= pr_mat_damaged;
-		pr_mat_damaged= cr_mat_damaged;
-		cr_mat_damaged= swap;
-
-		/* Update faces */
-		for(i=0, curf= 0; i<pr_lvl->totface; ++i) {
-			const int sides= cr_lvl->prev->faces[i].v[3] ? 4 : 3;
-			for(j=0; j<sides; ++j, ++curf) {
-				if(pr_flag_damaged[i]) {
-					cr_lvl->faces[curf].flag= pr_lvl->faces[i].flag;
-					cr_flag_damaged[curf]= 1;
-				}
-				if(pr_mat_damaged[i]) {
-					cr_lvl->faces[curf].mat_nr= pr_lvl->faces[i].mat_nr;
-					cr_mat_damaged[curf]= 1;
-				}
-			}
-		}
-
-		pr_lvl= pr_lvl->next;
-		cr_lvl= cr_lvl->next;
-	}
-
-	if(pr_flag_damaged) MEM_freeN(pr_flag_damaged);
-	if(cr_flag_damaged) MEM_freeN(cr_flag_damaged);
-	if(pr_mat_damaged) MEM_freeN(pr_mat_damaged);
-	if(cr_mat_damaged) MEM_freeN(cr_mat_damaged);
-}
-
-static void multires_update_colors(Mesh *me, EditMesh *em)
-{
-	MultiresLevel *lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
-	MultiresCol *pr_deltas= NULL, *cr_deltas= NULL;
-	CustomData *src= em ? &em->fdata : &me->fdata;
-	EditFace *efa= NULL;
-	unsigned i,j,curf= 0;
-	
-	if(me->mr->use_col) {
-		/* Calc initial deltas */
-		cr_deltas= MEM_callocN(sizeof(MultiresCol)*lvl->totface*4,"initial color/uv deltas");
-
-		if(em) efa= em->faces.first;
-		for(i=0; i<lvl->totface; ++i) {
-			MCol *col= em ? CustomData_em_get(src, efa->data, CD_MCOL) : &me->mcol[i*4];
-			for(j=0; j<4; ++j) {
-				if(me->mr->use_col) {
-					cr_deltas[i*4+j].a= col[j].a - lvl->colfaces[i].col[j].a;
-					cr_deltas[i*4+j].r= col[j].r - lvl->colfaces[i].col[j].r;
-					cr_deltas[i*4+j].g= col[j].g - lvl->colfaces[i].col[j].g;
-					cr_deltas[i*4+j].b= col[j].b - lvl->colfaces[i].col[j].b;
-				}
-			}
-			if(em) efa= efa->next;
-		}
-		
-		/* Update current level */
-		if(em) efa= em->faces.first;
-		for(i=0; i<lvl->totface; ++i) {
-			MultiresColFace *f= &lvl->colfaces[i];
-
-			if(me->mr->use_col)
-				mcol_to_multires(f, em ? CustomData_em_get(src, efa->data, CD_MCOL) : &me->mcol[i*4]);
-			
-			if(em) efa= efa->next;
-		}
-		
-		/* Update higher levels */
-		lvl= lvl->next;
-		while(lvl) {
-			/* Set up new deltas, but keep the ones from the previous level */
-			if(pr_deltas) MEM_freeN(pr_deltas);
-			pr_deltas= cr_deltas;
-			cr_deltas= MEM_callocN(sizeof(MultiresCol)*lvl->totface*4,"color deltas");
-
-			curf= 0;
-			for(i=0; i<lvl->prev->totface; ++i) {
-				const char sides= lvl->prev->faces[i].v[3]?4:3;
-				MultiresCol cntr;
-				
-				/* Find average color of 4 (or 3 for triangle) verts */
-				multires_col_avg(&cntr,&pr_deltas[i*4],sides);
-				
-				for(j=0; j<sides; ++j) {
-					multires_col_avg2(&cr_deltas[curf*4],
-							  &pr_deltas[i*4+j],
-							  &pr_deltas[i*4+(j==0?sides-1:j-1)]);
-					cr_deltas[curf*4+1]= pr_deltas[i*4+j];
-					multires_col_avg2(&cr_deltas[curf*4+2],
-							  &pr_deltas[i*4+j],
-							  &pr_deltas[i*4+(j==sides-1?0:j+1)]);
-					cr_deltas[curf*4+3]= cntr;
-					++curf;
-				}
-			}
-
-			for(i=0; i<lvl->totface; ++i) {
-				for(j=0; j<4; ++j) {
-					lvl->colfaces[i].col[j].a+= cr_deltas[i*4+j].a;
-					lvl->colfaces[i].col[j].r+= cr_deltas[i*4+j].r;
-					lvl->colfaces[i].col[j].g+= cr_deltas[i*4+j].g;
-					lvl->colfaces[i].col[j].b+= cr_deltas[i*4+j].b;
-				}
-			}
-
-			lvl= lvl->next;
-		}
-		if(pr_deltas) MEM_freeN(pr_deltas);
-		if(cr_deltas) MEM_freeN(cr_deltas);
-		
-		/* Update lower levels */
-		lvl= me->mr->levels.last;
-		lvl= lvl->prev;
-		while(lvl) {
-			MultiresColFace *nf= lvl->next->colfaces;
-			for(i=0; i<lvl->totface; ++i) {
-				MultiresFace *f= &lvl->faces[i];
-				for(j=0; j<(f->v[3]?4:3); ++j) {
-					lvl->colfaces[i].col[j]= nf->col[1];
-					++nf;
-				}
-			}
-			lvl= lvl->prev;
-		}
-	}
-}
-
-void multires_update_levels(Mesh *me, const int render)
-{
-	EditMesh *em= (!render && G.obedit) ? G.editMesh : NULL;
-
-	multires_update_first_level(me, em);
-	multires_update_faces(me, em);
-	multires_update_colors(me, em);
-}
-
-static void check_colors(Mesh *me)
-{
-	CustomData *src= G.obedit ? &G.editMesh->fdata : &me->fdata;
-	const char col= CustomData_has_layer(src, CD_MCOL);
-
-	/* Check if vertex colors have been deleted or added */
-	if(me->mr->use_col && !col)
-		me->mr->use_col= 0;
-	else if(!me->mr->use_col && col) {
-		me->mr->use_col= 1;
-		multires_load_cols(me);
-	}
-}
-
-static float clamp_component(const float c)
-{
-	if(c<0) return 0;
-	else if(c>255) return 255;
-	else return c;
-}
-
-void multires_to_mcol(MultiresColFace *f, MCol mcol[4])
-{
-	unsigned char j;
-	for(j=0; j<4; ++j) {
-		mcol->a= clamp_component(f->col[j].a);
-		mcol->r= clamp_component(f->col[j].r);
-		mcol->g= clamp_component(f->col[j].g);
-		mcol->b= clamp_component(f->col[j].b);
-		++mcol;
-	}
-}
-
-void multires_level_to_mesh(Object *ob, Mesh *me, const int render)
-{
-	MultiresLevel *lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
-	int i;
-	EditMesh *em= (!render && G.obedit) ? G.editMesh : NULL;
-	
-	if(em)
-		return;
-
-	CustomData_free_layer_active(&me->vdata, CD_MVERT, me->totvert);
-	CustomData_free_layer_active(&me->edata, CD_MEDGE, me->totedge);
-	CustomData_free_layer_active(&me->fdata, CD_MFACE, me->totface);
-	CustomData_free_layer_active(&me->vdata, CD_MDEFORMVERT, me->totvert);
-	CustomData_free_layers(&me->fdata, CD_MTFACE, me->totface);
-	CustomData_free_layers(&me->fdata, CD_MCOL, me->totface);
-		
-	me->totvert= lvl->totvert;
-	me->totface= lvl->totface;
-	me->totedge= lvl->totedge;
-
-	CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert);
-	CustomData_add_layer(&me->edata, CD_MEDGE, CD_CALLOC, NULL, me->totedge);
-	CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface);
-	mesh_update_customdata_pointers(me);
-
-	/* Vertices/Edges/Faces */
-	
-	for(i=0; i<lvl->totvert; ++i) {
-		me->mvert[i]= me->mr->verts[i];
-	}
-	for(i=0; i<lvl->totedge; ++i) {
-		me->medge[i].v1= lvl->edges[i].v[0];
-		me->medge[i].v2= lvl->edges[i].v[1];
-		me->medge[i].flag &= ~ME_HIDE;
-	}
-	for(i=0; i<lvl->totface; ++i) {
-		me->mface[i].v1= lvl->faces[i].v[0];
-		me->mface[i].v2= lvl->faces[i].v[1];
-		me->mface[i].v3= lvl->faces[i].v[2];
-		me->mface[i].v4= lvl->faces[i].v[3];
-		me->mface[i].flag= lvl->faces[i].flag;
-		me->mface[i].flag &= ~ME_HIDE;
-		me->mface[i].mat_nr= lvl->faces[i].mat_nr;
-	}
-	
-	/* Edge flags */
-	if(lvl==me->mr->levels.first) {
-		for(i=0; i<lvl->totedge; ++i) {
-			me->medge[i].flag= me->mr->edge_flags[i];
-			me->medge[i].crease= me->mr->edge_creases[i];
-		}
-	} else {
-		MultiresLevel *lvl1= me->mr->levels.first;
-		const int last= lvl1->totedge * pow(2, me->mr->current-1);
-		for(i=0; i<last; ++i) {
-			const int ndx= i / pow(2, me->mr->current-1);
-			
-			me->medge[i].flag= me->mr->edge_flags[ndx];
-			me->medge[i].crease= me->mr->edge_creases[ndx];
-		}
-	}
-
-	multires_customdata_to_mesh(me, em, lvl, &me->mr->vdata, em ? &em->vdata : &me->vdata, CD_MDEFORMVERT);
-	multires_customdata_to_mesh(me, em, lvl, &me->mr->fdata, em ? &em->fdata : &me->fdata, CD_MTFACE);
-
-	/* Colors */
-	if(me->mr->use_col) {
-		CustomData *src= &me->fdata;
-		
-		if(me->mr->use_col) me->mcol= CustomData_add_layer(src, CD_MCOL, CD_CALLOC, NULL, me->totface);
-		
-		for(i=0; i<lvl->totface; ++i) {
-			if(me->mr->use_col)
-				multires_to_mcol(&lvl->colfaces[i], &me->mcol[i*4]);
-		}
-			
-	}
-	
-	mesh_update_customdata_pointers(me);
-	
-	multires_edge_level_update(ob,me);
-	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
-}
-
-void multires_set_level(Object *ob, Mesh *me, const int render)
-{
-	if(me->pv) mesh_pmv_off(ob, me);
-
-	check_colors(me);
-	multires_update_levels(me, render);
-
-	me->mr->current= me->mr->newlvl;
-	if(me->mr->current<1) me->mr->current= 1;
-	else if(me->mr->current>me->mr->level_count) me->mr->current= me->mr->level_count;
-
-	multires_level_to_mesh(ob, me, render);
-}
-
-/* Update the edge visibility flags to only show edges on or below the edgelvl */
-void multires_edge_level_update(Object *ob, Mesh *me)
-{
-	if(!G.obedit) {
-		MultiresLevel *cr_lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
-		MultiresLevel *edge_lvl= BLI_findlink(&me->mr->levels,me->mr->edgelvl-1);
-		const int threshold= edge_lvl->totedge * pow(2, me->mr->current - me->mr->edgelvl);
-		unsigned i;
-
-		for(i=0; i<cr_lvl->totedge; ++i) {
-			const int ndx= me->pv ? me->pv->edge_map[i] : i;
-			if(ndx != -1) { /* -1= hidden edge */
-				if(me->mr->edgelvl >= me->mr->current || i<threshold)
-					me->medge[ndx].flag |= ME_EDGEDRAW | ME_EDGERENDER;
-				else
-					me->medge[ndx].flag &= ~ME_EDGEDRAW & ~ME_EDGERENDER;
-			}
-		}
-		
-		DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-	}
-}
-
 void create_vert_face_map(ListBase **map, IndexNode **mem, const MFace *mface, const int totvert, const int totface)
 {
 	int i,j;