svn merge ^/trunk/blender -r40644:40720
[blender-staging.git] / source / blender / editors / space_view3d / drawobject.c
index 35c3e909d845921674995c1b77a813355f166777..b8fb8934dd9d85c421fdadc7baae03291cb0d633 100644 (file)
@@ -49,6 +49,7 @@
 #include "DNA_world_types.h"
 #include "DNA_armature_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
@@ -77,6 +78,8 @@
 #include "BKE_pointcache.h"
 #include "BKE_unit.h"
 
+#include "BKE_tessmesh.h"
+
 #include "smoke_API.h"
 
 #include "IMB_imbuf.h"
@@ -1658,16 +1661,18 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
  * use the object matrix in the useual way */
 static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
-       struct { void (*func)(void *userData, EditVert *eve, int x, int y, int index); void *userData; ViewContext vc; int clipVerts; } *data = userData;
-       EditVert *eve = EM_get_vert_for_index(index);
+       struct { void (*func)(void *userData, BMVert *eve, int x, int y, int index); void *userData; ViewContext vc; int clipVerts; float pmat[4][4], vmat[4][4]; } *data = userData;
+       BMVert *eve = EDBM_get_vert_for_index(data->vc.em, index);
 
-       if (eve->h==0) {
+       if (!BM_TestHFlag(eve, BM_HIDDEN)) {
                short s[2]= {IS_CLIPPED, 0};
 
                if (data->clipVerts) {
                        view3d_project_short_clip(data->vc.ar, co, s, 1);
                } else {
-                       view3d_project_short_noclip(data->vc.ar, co, s);
+                       float co2[2];
+                       mul_v3_m4v3(co2, data->vc.obedit->obmat, co);
+                       project_short_noclip(data->vc.ar, co2, s);
                }
 
                if (s[0]!=IS_CLIPPED)
@@ -1675,22 +1680,22 @@ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co
        }
 }
 
-void mesh_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, EditVert *eve, int x, int y, int index), void *userData, int clipVerts)
+void mesh_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, BMVert *eve, int x, int y, int index), void *userData, int clipVerts)
 {
-       struct { void (*func)(void *userData, EditVert *eve, int x, int y, int index); void *userData; ViewContext vc; int clipVerts; } data;
-       DerivedMesh *dm = editmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+       struct { void (*func)(void *userData, BMVert *eve, int x, int y, int index); void *userData; ViewContext vc; int clipVerts; float pmat[4][4], vmat[4][4]; } data;
+       DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
        
        data.vc= *vc;
        data.func = func;
        data.userData = userData;
        data.clipVerts = clipVerts;
 
+       EDBM_init_index_arrays(vc->em, 1, 0, 0);
        if(clipVerts)
                ED_view3d_local_clipping(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 
-       EM_init_index_arrays(vc->em, 1, 0, 0);
        dm->foreachMappedVert(dm, mesh_foreachScreenVert__mapFunc, &data);
-       EM_free_index_arrays();
+       EDBM_free_index_arrays(vc->em);
 
        dm->release(dm);
 }
@@ -1723,17 +1728,23 @@ static void drawSelectedVertices(DerivedMesh *dm, Mesh *me)
 }
 static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0co, float *v1co)
 {
-       struct { void (*func)(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index); void *userData; ViewContext vc; int clipVerts; } *data = userData;
-       EditEdge *eed = EM_get_edge_for_index(index);
-       short s[2][2];
+       struct { void (*func)(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index); void *userData; ViewContext vc; int clipVerts; float pmat[4][4], vmat[4][4]; } *data = userData;
+       BMEdge *eed = EDBM_get_edge_for_index(data->vc.em, index);
+
+       if (!BM_TestHFlag(eed, BM_HIDDEN)) {
+               short s[2][2];
 
-       if (eed->h==0) {
                if (data->clipVerts==1) {
                        view3d_project_short_clip(data->vc.ar, v0co, s[0], 1);
                        view3d_project_short_clip(data->vc.ar, v1co, s[1], 1);
                } else {
-                       view3d_project_short_noclip(data->vc.ar, v0co, s[0]);
-                       view3d_project_short_noclip(data->vc.ar, v1co, s[1]);
+                       float v1_co[3], v2_co[3];
+
+                       mul_v3_m4v3(v1_co, data->vc.obedit->obmat, v0co);
+                       mul_v3_m4v3(v2_co, data->vc.obedit->obmat, v1co);
+
+                       project_short_noclip(data->vc.ar, v1_co, s[0]);
+                       project_short_noclip(data->vc.ar, v2_co, s[1]);
 
                        if (data->clipVerts==2) {
                                if (!(s[0][0]>=0 && s[0][1]>= 0 && s[0][0]<data->vc.ar->winx && s[0][1]<data->vc.ar->winy))
@@ -1746,54 +1757,59 @@ static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0
        }
 }
 
-void mesh_foreachScreenEdge(ViewContext *vc, void (*func)(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts)
+void mesh_foreachScreenEdge(ViewContext *vc, void (*func)(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts)
 {
-       struct { void (*func)(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index); void *userData; ViewContext vc; int clipVerts; } data;
-       DerivedMesh *dm = editmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+       struct { void (*func)(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index); void *userData; ViewContext vc; int clipVerts; float pmat[4][4], vmat[4][4]; } data;
+       DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
        data.vc= *vc;
        data.func = func;
        data.userData = userData;
        data.clipVerts = clipVerts;
 
+       EDBM_init_index_arrays(vc->em, 0, 1, 0);
        if(clipVerts)
                ED_view3d_local_clipping(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 
-       EM_init_index_arrays(vc->em, 0, 1, 0);
        dm->foreachMappedEdge(dm, mesh_foreachScreenEdge__mapFunc, &data);
-       EM_free_index_arrays();
+       EDBM_free_index_arrays(vc->em);
 
        dm->release(dm);
 }
 
 static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *cent, float *UNUSED(no))
 {
-       struct { void (*func)(void *userData, EditFace *efa, int x, int y, int index); void *userData; ViewContext vc; } *data = userData;
-       EditFace *efa = EM_get_face_for_index(index);
-       short s[2];
+       struct { void (*func)(void *userData, BMFace *efa, int x, int y, int index); void *userData; ViewContext vc; float pmat[4][4], vmat[4][4]; } *data = userData;
+       BMFace *efa = EDBM_get_face_for_index(data->vc.em, index);
+
+       if (efa && !BM_TestHFlag(efa, BM_HIDDEN)) {
+               float cent2[3];
+               short s[2];
 
-       if (efa && efa->h==0 && efa->fgonf!=EM_FGON) {
-               view3d_project_short_clip(data->vc.ar, cent, s, 1);
+               mul_v3_m4v3(cent2, data->vc.obedit->obmat, cent);
+               project_short(data->vc.ar, cent2, s);
 
-               data->func(data->userData, efa, s[0], s[1], index);
+               if (s[0] != IS_CLIPPED) {
+                       data->func(data->userData, efa, s[0], s[1], index);
+               }
        }
 }
 
-void mesh_foreachScreenFace(ViewContext *vc, void (*func)(void *userData, EditFace *efa, int x, int y, int index), void *userData)
+void mesh_foreachScreenFace(ViewContext *vc, void (*func)(void *userData, BMFace *efa, int x, int y, int index), void *userData)
 {
-       struct { void (*func)(void *userData, EditFace *efa, int x, int y, int index); void *userData; ViewContext vc; } data;
-       DerivedMesh *dm = editmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
+       struct { void (*func)(void *userData, BMFace *efa, int x, int y, int index); void *userData; ViewContext vc; float pmat[4][4], vmat[4][4]; } data;
+       DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
        data.vc= *vc;
        data.func = func;
        data.userData = userData;
 
+       EDBM_init_index_arrays(vc->em, 0, 0, 1);
        //if(clipVerts)
        ED_view3d_local_clipping(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 
-       EM_init_index_arrays(vc->em, 0, 0, 1);
        dm->foreachMappedFaceCenter(dm, mesh_foreachScreenFace__mapFunc, &data);
-       EM_free_index_arrays();
+       EDBM_free_index_arrays(vc->em);
 
        dm->release(dm);
 }
@@ -1860,46 +1876,53 @@ void nurbs_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, Nurb
 
 static void draw_dm_face_normals__mapFunc(void *userData, int index, float *cent, float *no)
 {
-       ToolSettings *ts= ((Scene *)userData)->toolsettings;
-       EditFace *efa = EM_get_face_for_index(index);
+       Scene *scene= ((void **)userData)[0];
+       BMEditMesh *em = ((void **)userData)[1];
+       BMFace *efa = EDBM_get_face_for_index(em, index);
+       ToolSettings *ts= scene->toolsettings;
 
-       if (efa->h==0 && efa->fgonf!=EM_FGON) {
+       if (!BM_TestHFlag(efa, BM_HIDDEN)) {
                glVertex3fv(cent);
                glVertex3f(     cent[0] + no[0]*ts->normalsize,
                                        cent[1] + no[1]*ts->normalsize,
                                        cent[2] + no[2]*ts->normalsize);
        }
 }
-static void draw_dm_face_normals(Scene *scene, DerivedMesh *dm) 
+static void draw_dm_face_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm) 
 {
+       void *ptrs[2] = {scene, em};
+
        glBegin(GL_LINES);
-       dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, scene);
+       dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, ptrs);
        glEnd();
 }
 
 static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent, float *UNUSED(no))
 {
-       EditFace *efa = EM_get_face_for_index(index);
-       int sel = *((int*) userData);
-
-       if (efa->h==0 && efa->fgonf!=EM_FGON && (efa->f&SELECT)==sel) {
+       BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index);
+       int sel = *(((int **)userData)[1]);
+       
+       if (efa && !BM_TestHFlag(efa, BM_HIDDEN) && BM_TestHFlag(efa, BM_SELECT)==sel) {
                bglVertex3fv(cent);
        }
 }
-static void draw_dm_face_centers(DerivedMesh *dm, int sel)
+static void draw_dm_face_centers(BMEditMesh *em, DerivedMesh *dm, int sel)
 {
+       void *ptrs[2] = {em, &sel};
+
        bglBegin(GL_POINTS);
-       dm->foreachMappedFaceCenter(dm, draw_dm_face_centers__mapFunc, &sel);
+       dm->foreachMappedFaceCenter(dm, draw_dm_face_centers__mapFunc, ptrs);
        bglEnd();
 }
 
 static void draw_dm_vert_normals__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
 {
-       Scene *scene= (Scene *)userData;
+       Scene *scene= ((void **)userData)[0];
        ToolSettings *ts= scene->toolsettings;
-       EditVert *eve = EM_get_vert_for_index(index);
+       BMEditMesh *em = ((void **)userData)[1];
+       BMVert *eve = EDBM_get_vert_for_index(em, index);
 
-       if (eve->h==0) {
+       if (!BM_TestHFlag(eve, BM_HIDDEN)) {
                glVertex3fv(co);
 
                if (no_f) {
@@ -1913,20 +1936,22 @@ static void draw_dm_vert_normals__mapFunc(void *userData, int index, float *co,
                }
        }
 }
-static void draw_dm_vert_normals(Scene *scene, DerivedMesh *dm) 
+static void draw_dm_vert_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm) 
 {
+       void *ptrs[2] = {scene, em};
+
        glBegin(GL_LINES);
-       dm->foreachMappedVert(dm, draw_dm_vert_normals__mapFunc, scene);
+       dm->foreachMappedVert(dm, draw_dm_vert_normals__mapFunc, ptrs);
        glEnd();
 }
 
-       /* Draw verts with color set based on selection */
+/* Draw verts with color set based on selection */
 static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
-       struct { int sel; EditVert *eve_act; } * data = userData;
-       EditVert *eve = EM_get_vert_for_index(index);
+       struct { BMEditMesh *em; int sel; BMVert *eve_act; } *data = userData;
+       BMVert *eve = EDBM_get_vert_for_index(data->em, index);
 
-       if (eve->h==0 && (eve->f&SELECT)==data->sel) {
+       if (!BM_TestHFlag(eve, BM_HIDDEN) && BM_TestHFlag(eve, BM_SELECT)==data->sel) {
                /* draw active larger - need to stop/start point drawing for this :/ */
                if (eve==data->eve_act) {
                        float size = UI_GetThemeValuef(TH_VERTEX_SIZE);
@@ -1948,11 +1973,16 @@ static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *
        }
 }
 
-static void draw_dm_verts(DerivedMesh *dm, int sel, EditVert *eve_act)
+static void draw_dm_verts(BMEditMesh *em, DerivedMesh *dm, int sel, BMVert *eve_act)
 {
-       struct { int sel; EditVert *eve_act; } data;
+       struct { BMEditMesh *em; int sel; BMVert *eve_act; } data;
        data.sel = sel;
        data.eve_act = eve_act;
+       data.em = em;
+       
+       bglBegin(GL_POINTS);
+       dm->foreachMappedVert(dm, draw_dm_verts__mapFunc, &data);
+       bglEnd();
 
        bglBegin(GL_POINTS);
        dm->foreachMappedVert(dm, draw_dm_verts__mapFunc, &data);
@@ -1962,16 +1992,18 @@ static void draw_dm_verts(DerivedMesh *dm, int sel, EditVert *eve_act)
        /* Draw edges with color set based on selection */
 static int draw_dm_edges_sel__setDrawOptions(void *userData, int index)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
+       BMEdge *eed;
        //unsigned char **cols = userData, *col;
-       struct { unsigned char *baseCol, *selCol, *actCol; EditEdge *eed_act; } * data = userData;
+       struct { BMEditMesh *em; unsigned char *baseCol, *selCol, *actCol; BMEdge *eed_act; } * data = userData;
        unsigned char *col;
 
-       if (eed->h==0) {
+       eed = EDBM_get_edge_for_index(data->em, index);
+
+       if (!BM_TestHFlag(eed, BM_HIDDEN)) {
                if (eed==data->eed_act) {
                        glColor4ubv(data->actCol);
                } else {
-                       if (eed->f&SELECT) {
+                       if (BM_TestHFlag(eed, BM_SELECT)) {
                                col = data->selCol;
                        } else {
                                col = data->baseCol;
@@ -1986,38 +2018,40 @@ static int draw_dm_edges_sel__setDrawOptions(void *userData, int index)
                return 0;
        }
 }
-static void draw_dm_edges_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol, unsigned char *actCol, EditEdge *eed_act) 
+static void draw_dm_edges_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol, 
+                             unsigned char *selCol, unsigned char *actCol, BMEdge *eed_act) 
 {
-       struct { unsigned char *baseCol, *selCol, *actCol; EditEdge *eed_act; } data;
+       struct { BMEditMesh *em; unsigned char *baseCol, *selCol, *actCol; BMEdge *eed_act; } data;
        
        data.baseCol = baseCol;
        data.selCol = selCol;
        data.actCol = actCol;
+       data.em = em;
        data.eed_act = eed_act;
        dm->drawMappedEdges(dm, draw_dm_edges_sel__setDrawOptions, &data);
 }
 
        /* Draw edges */
-static int draw_dm_edges__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_edges__setDrawOptions(void *userData, int index)
 {
-       return EM_get_edge_for_index(index)->h==0;
+       return !BM_TestHFlag(EDBM_get_edge_for_index(userData, index), BM_HIDDEN);
 }
-static void draw_dm_edges(DerivedMesh *dm) 
+static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm) 
 {
-       dm->drawMappedEdges(dm, draw_dm_edges__setDrawOptions, NULL);
+       dm->drawMappedEdges(dm, draw_dm_edges__setDrawOptions, em);
 }
 
        /* Draw edges with color interpolated based on selection */
-static int draw_dm_edges_sel_interp__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)
 {
-       return EM_get_edge_for_index(index)->h==0;
+       return !BM_TestHFlag(EDBM_get_edge_for_index(((void**)userData)[0], index), BM_HIDDEN);
 }
 static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
+       BMEdge *eed = EDBM_get_edge_for_index(((void**)userData)[0], index);
        unsigned char **cols = userData;
-       unsigned char *col0 = cols[(eed->v1->f&SELECT)?1:0];
-       unsigned char *col1 = cols[(eed->v2->f&SELECT)?1:0];
+       unsigned char *col0 = cols[(BM_TestHFlag(eed->v1, BM_SELECT))?2:1];
+       unsigned char *col1 = cols[(BM_TestHFlag(eed->v2, BM_SELECT))?2:1];
 
        glColor4ub(     col0[0] + (col1[0]-col0[0])*t,
                                col0[1] + (col1[1]-col0[1])*t,
@@ -2025,36 +2059,36 @@ static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int i
                                col0[3] + (col1[3]-col0[3])*t);
 }
 
-static void draw_dm_edges_sel_interp(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol)
+static void draw_dm_edges_sel_interp(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol)
 {
-       unsigned char *cols[2];
-       cols[0]= baseCol;
-       cols[1]= selCol;
+       void *cols[3] = {em, baseCol, selCol};
+
        dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_sel_interp__setDrawInterpOptions, cols);
 }
 
        /* Draw only seam edges */
-static int draw_dm_edges_seams__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_edges_seams__setDrawOptions(void *userData, int index)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
+       BMEdge *eed = EDBM_get_edge_for_index(userData, index);
 
-       return (eed->h==0 && eed->seam);
+       return !BM_TestHFlag(eed, BM_HIDDEN) && BM_TestHFlag(eed, BM_SEAM);
 }
-static void draw_dm_edges_seams(DerivedMesh *dm)
+
+static void draw_dm_edges_seams(BMEditMesh *em, DerivedMesh *dm)
 {
-       dm->drawMappedEdges(dm, draw_dm_edges_seams__setDrawOptions, NULL);
+       dm->drawMappedEdges(dm, draw_dm_edges_seams__setDrawOptions, em);
 }
 
        /* Draw only sharp edges */
-static int draw_dm_edges_sharp__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_edges_sharp__setDrawOptions(void *userData, int index)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
+       BMEdge *eed = EDBM_get_edge_for_index(userData, index);
 
-       return (eed->h==0 && eed->sharp);
+       return !BM_TestHFlag(eed, BM_HIDDEN) && BM_TestHFlag(eed, BM_SHARP);
 }
-static void draw_dm_edges_sharp(DerivedMesh *dm)
+static void draw_dm_edges_sharp(BMEditMesh *em, DerivedMesh *dm)
 {
-       dm->drawMappedEdges(dm, draw_dm_edges_sharp__setDrawOptions, NULL);
+       dm->drawMappedEdges(dm, draw_dm_edges_sharp__setDrawOptions, em);
 }
 
 
@@ -2062,16 +2096,19 @@ static void draw_dm_edges_sharp(DerivedMesh *dm)
         * return 2 for the active face so it renders with stipple enabled */
 static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
-       struct { unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
-       EditFace *efa = EM_get_face_for_index(index);
+       struct { unsigned char *cols[3]; BMEditMesh *em; BMFace *efa_act; Mesh *me;} *data = userData;
+       BMFace *efa = EDBM_get_face_for_index(data->em, index);
        unsigned char *col;
        
-       if (efa->h==0) {
+       if (!efa)
+               return 0;
+       
+       if (!BM_TestHFlag(efa, BM_HIDDEN)) {
                if (efa == data->efa_act) {
                        glColor4ubv(data->cols[2]);
                        return 2; /* stipple */
                } else {
-                       col = data->cols[(efa->f&SELECT)?1:0];
+                       col = data->cols[BM_TestHFlag(efa, BM_SELECT)?1:0];
                        if (col[3]==0) return 0;
                        glColor4ubv(col);
                        return 1;
@@ -2082,9 +2119,9 @@ static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNU
 
 static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int next_index)
 {
-       struct { unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
-       EditFace *efa = EM_get_face_for_index(index);
-       EditFace *next_efa = EM_get_face_for_index(next_index);
+       struct { unsigned char *cols[3]; BMEditMesh *em; BMFace *efa_act; Mesh *me;} * data = userData;
+       BMFace *efa = EDBM_get_face_for_index(data->em, index);
+       BMFace *next_efa = EDBM_get_face_for_index(data->em, next_index);
        unsigned char *col, *next_col;
 
        if(efa == next_efa)
@@ -2093,8 +2130,8 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int
        if(efa == data->efa_act || next_efa == data->efa_act)
                return 0;
 
-       col = data->cols[(efa->f&SELECT)?1:0];
-       next_col = data->cols[(next_efa->f&SELECT)?1:0];
+       col = data->cols[BM_TestHFlag(efa, BM_SELECT)?1:0];
+       next_col = data->cols[BM_TestHFlag(next_efa, BM_SELECT)?1:0];
 
        if(col[3]==0 || next_col[3]==0)
                return 0;
@@ -2103,68 +2140,87 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int
 }
 
 /* also draws the active face */
-static void draw_dm_faces_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol, unsigned char *actCol, EditFace *efa_act) 
+static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *baseCol, 
+                             unsigned char *selCol, unsigned char *actCol, BMFace *efa_act, Mesh *me) 
 {
-       struct { unsigned char *cols[3]; EditFace *efa_act; } data;
+       struct { unsigned char *cols[3]; BMEditMesh *em; BMFace *efa_act; Mesh *me;} data;
+
        data.cols[0] = baseCol;
+       data.em = em;
        data.cols[1] = selCol;
        data.cols[2] = actCol;
        data.efa_act = efa_act;
+       data.me = me;
 
        dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, &data, 0, GPU_enable_material, draw_dm_faces_sel__compareDrawOptions);
 }
 
-static int draw_dm_creases__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_creases__setDrawOptions(void *userData, int index)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
-
-       if (eed->h==0 && eed->crease != 0.0f) {
-               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, eed->crease);
+       BMEditMesh *em = userData;
+       BMEdge *eed = EDBM_get_edge_for_index(userData, index);
+       float *crease = eed ? bm_get_cd_float(&em->bm->edata, eed->head.data, CD_CREASE) : NULL;
+       
+       if (!crease)
+               return 0;
+       
+       if (!BM_TestHFlag(eed, BM_HIDDEN) && *crease!=0.0f) {
+               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, *crease);
                return 1;
        } else {
                return 0;
        }
 }
-static void draw_dm_creases(DerivedMesh *dm)
+static void draw_dm_creases(BMEditMesh *em, DerivedMesh *dm)
 {
        glLineWidth(3.0);
-       dm->drawMappedEdges(dm, draw_dm_creases__setDrawOptions, NULL);
+       dm->drawMappedEdges(dm, draw_dm_creases__setDrawOptions, em);
        glLineWidth(1.0);
 }
 
-static int draw_dm_bweights__setDrawOptions(void *UNUSED(userData), int index)
+static int draw_dm_bweights__setDrawOptions(void *userData, int index)
 {
-       EditEdge *eed = EM_get_edge_for_index(index);
+       BMEditMesh *em = userData;
+       BMEdge *eed = EDBM_get_edge_for_index(userData, index);
+       float *bweight = bm_get_cd_float(&em->bm->edata, eed->head.data, CD_BWEIGHT);
 
-       if (eed->h==0 && eed->bweight != 0.0f) {
-               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, eed->bweight);
+       if (!bweight)
+               return 0;
+       
+       if (!BM_TestHFlag(eed, BM_HIDDEN) && *bweight!=0.0f) {
+               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, *bweight);
                return 1;
        } else {
                return 0;
        }
 }
-static void draw_dm_bweights__mapFunc(void *UNUSED(userData), int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
+static void draw_dm_bweights__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
-       EditVert *eve = EM_get_vert_for_index(index);
-
-       if (eve->h==0 && eve->bweight != 0.0f) {
-               UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_SELECT, eve->bweight);
+       BMEditMesh *em = userData;
+       BMVert *eve = EDBM_get_vert_for_index(userData, index);
+       float *bweight = bm_get_cd_float(&em->bm->vdata, eve->head.data, CD_BWEIGHT);
+       
+       if (!bweight)
+               return;
+       
+       if (!BM_TestHFlag(eve, BM_HIDDEN) && *bweight!=0.0f) {
+               UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_SELECT, *bweight);
                bglVertex3fv(co);
        }
 }
-static void draw_dm_bweights(Scene *scene, DerivedMesh *dm)
+static void draw_dm_bweights(BMEditMesh *em, Scene *scene, DerivedMesh *dm)
 {
        ToolSettings *ts= scene->toolsettings;
 
        if (ts->selectmode & SCE_SELECT_VERTEX) {
                glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) + 2);
                bglBegin(GL_POINTS);
-               dm->foreachMappedVert(dm, draw_dm_bweights__mapFunc, NULL);
+               dm->foreachMappedVert(dm, draw_dm_bweights__mapFunc, em);
                bglEnd();
        }
        else {
                glLineWidth(3.0);
-               dm->drawMappedEdges(dm, draw_dm_bweights__setDrawOptions, NULL);
+               dm->drawMappedEdges(dm, draw_dm_bweights__setDrawOptions, em);
                glLineWidth(1.0);
        }
 }
@@ -2178,7 +2234,8 @@ static void draw_dm_bweights(Scene *scene, DerivedMesh *dm)
 
 /* EditMesh drawing routines*/
 
-static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, DerivedMesh *cageDM, EditVert *eve_act)
+static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, 
+                               BMEditMesh *em, DerivedMesh *cageDM, BMVert *eve_act)
 {
        ToolSettings *ts= scene->toolsettings;
        int sel;
@@ -2215,13 +2272,13 @@ static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, Deriv
                        if(ts->selectmode & SCE_SELECT_VERTEX) {
                                glPointSize(size);
                                glColor4ubv(col);
-                               draw_dm_verts(cageDM, sel, eve_act);
+                               draw_dm_verts(em, cageDM, sel, eve_act);
                        }
                        
                        if(check_ob_drawface_dot(scene, v3d, obedit->dt)) {
                                glPointSize(fsize);
                                glColor4ubv(fcol);
-                               draw_dm_face_centers(cageDM, sel);
+                               draw_dm_face_centers(em, cageDM, sel);
                        }
                        
                        if (pass==0) {
@@ -2235,7 +2292,9 @@ static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, Deriv
        glPointSize(1.0);
 }
 
-static void draw_em_fancy_edges(Scene *scene, View3D *v3d, Mesh *me, DerivedMesh *cageDM, short sel_only, EditEdge *eed_act)
+static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d, 
+                               Mesh *me, DerivedMesh *cageDM, short sel_only, 
+                               BMEdge *eed_act)
 {
        ToolSettings *ts= scene->toolsettings;
        int pass;
@@ -2268,21 +2327,21 @@ static void draw_em_fancy_edges(Scene *scene, View3D *v3d, Mesh *me, DerivedMesh
                }
 
                if(ts->selectmode == SCE_SELECT_FACE) {
-                       draw_dm_edges_sel(cageDM, wireCol, selCol, actCol, eed_act);
+                       draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
                }       
                else if( (me->drawflag & ME_DRAWEDGES) || (ts->selectmode & SCE_SELECT_EDGE) ) {        
                        if(cageDM->drawMappedEdgesInterp && (ts->selectmode & SCE_SELECT_VERTEX)) {
                                glShadeModel(GL_SMOOTH);
-                               draw_dm_edges_sel_interp(cageDM, wireCol, selCol);
+                               draw_dm_edges_sel_interp(em, cageDM, wireCol, selCol);
                                glShadeModel(GL_FLAT);
                        } else {
-                               draw_dm_edges_sel(cageDM, wireCol, selCol, actCol, eed_act);
+                               draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act);
                        }
                }
                else {
                        if (!sel_only) {
                                glColor4ubv(wireCol);
-                               draw_dm_edges(cageDM);
+                               draw_dm_edges(em, cageDM);
                        }
                }
 
@@ -2293,13 +2352,11 @@ static void draw_em_fancy_edges(Scene *scene, View3D *v3d, Mesh *me, DerivedMesh
        }
 }      
 
-static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, EditMesh *em, UnitSettings *unit)
+static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, 
+                                 Object *ob, BMEditMesh *em, UnitSettings *unit)
 {
        Mesh *me= ob->data;
-       EditEdge *eed;
-       EditFace *efa;
-       float v1[3], v2[3], v3[3], v4[3], vmid[3];
-       float fvec[3];
+       float v1[3], v2[3], v3[3], vmid[3], fvec[3];
        char val[32]; /* Stores the measurement display text here */
        const char *conv_float; /* Use a float conversion matching the grid size */
        unsigned char col[4]= {0, 0, 0, 255}; /* color of the text to draw */
@@ -2309,6 +2366,9 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        const int do_global= v3d->flag & V3D_GLOBAL_STATS;
        const int do_moving= G.moving;
 
+       BMIter iter;
+       int i;
+
        /* make the precision of the pronted value proportionate to the gridsize */
 
        if (grid < 0.01f)               conv_float= "%.6g";
@@ -2323,11 +2383,16 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        if(v3d->zbuf) bglPolygonOffset(rv3d->dist, 5.0f);
        
        if(me->drawflag & ME_DRAWEXTRA_EDGELEN) {
+               BMEdge *eed;
+
                UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
 
-               for(eed= em->edges.first; eed; eed= eed->next) {
-                       /* draw non fgon edges, or selected edges, or edges next to selected verts while draging */
-                       if((eed->h != EM_FGON) && ((eed->f & SELECT) || (do_moving && ((eed->v1->f & SELECT) || (eed->v2->f & SELECT)) ))) {
+               eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL);
+               for(; eed; eed=BMIter_Step(&iter)) {
+                       /* draw selected edges, or edges next to selected verts while draging */
+                       if(BM_TestHFlag(eed, BM_SELECT) ||
+                               (do_moving && (BM_TestHFlag(eed->v1, BM_SELECT) || BM_TestHFlag(eed->v2, BM_SELECT) ))) {
+
                                copy_v3_v3(v1, eed->v1->co);
                                copy_v3_v3(v2, eed->v2->co);
 
@@ -2348,92 +2413,91 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        }
 
        if(me->drawflag & ME_DRAWEXTRA_FACEAREA) {
-// XXX         extern int faceselectedOR(EditFace *efa, int flag);             // editmesh.h shouldn't be in this file... ok for now?
+               /* would be nice to use BM_face_area, but that is for 2d faces
+               so instead add up tessalation triangle areas */
+               BMFace *f;
+               int n;
+
+#define DRAW_EM_MEASURE_STATS_FACEAREA()\
+               if (BM_TestHFlag(f, BM_SELECT)) {\
+                       mul_v3_fl(vmid, 1.0/n);\
+                       if(unit->system)\
+                               bUnit_AsString(val, sizeof(val), area*unit->scale_length,\
+                                       3, unit->system, B_UNIT_LENGTH, do_split, FALSE);\
+                       else\
+                               sprintf(val, conv_float, area);\
+                       view3d_cached_text_draw_add(vmid, val, 0, V3D_CACHE_TEXT_ASCII, col);\
+               }
+
                UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
                
-               for(efa= em->faces.first; efa; efa= efa->next) {
-                       if((efa->f & SELECT)) { // XXX || (do_moving && faceselectedOR(efa, SELECT)) ) {
-                               copy_v3_v3(v1, efa->v1->co);
-                               copy_v3_v3(v2, efa->v2->co);
-                               copy_v3_v3(v3, efa->v3->co);
-                               if (efa->v4) {
-                                       copy_v3_v3(v4, efa->v4->co);
-                               }
-                               if(do_global) {
-                                       mul_mat3_m4_v3(ob->obmat, v1);
-                                       mul_mat3_m4_v3(ob->obmat, v2);
-                                       mul_mat3_m4_v3(ob->obmat, v3);
-                                       if (efa->v4) mul_mat3_m4_v3(ob->obmat, v4);
-                               }
-                               
-                               if (efa->v4)
-                                       area=  area_quad_v3(v1, v2, v3, v4);
-                               else
-                                       area = area_tri_v3(v1, v2, v3);
-
-                               if(unit->system)
-                                       bUnit_AsString(val, sizeof(val), area*unit->scale_length, 3, unit->system, B_UNIT_LENGTH, do_split, FALSE); // XXX should be B_UNIT_AREA
-                               else
-                                       sprintf(val, conv_float, area);
-
-                               view3d_cached_text_draw_add(efa->cent, val, 0, V3D_CACHE_TEXT_ASCII, col);
+               f = NULL;
+               area = 0.0;
+               zero_v3(vmid);
+               n = 0;
+               for(i = 0; i < em->tottri; i++) {
+                       BMLoop **l = em->looptris[i];
+                       if(f && l[0]->f != f) {
+                               DRAW_EM_MEASURE_STATS_FACEAREA();
+                               zero_v3(vmid);
+                               area = 0.0;
+                               n = 0;
                        }
-               }
-       }
 
-       if(me->drawflag & ME_DRAWEXTRA_FACEANG) {
-               EditEdge *e1, *e2, *e3, *e4;
-               UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-               for(efa= em->faces.first; efa; efa= efa->next) {
-                       copy_v3_v3(v1, efa->v1->co);
-                       copy_v3_v3(v2, efa->v2->co);
-                       copy_v3_v3(v3, efa->v3->co);
-                       if(efa->v4) {
-                               copy_v3_v3(v4, efa->v4->co); 
-                       }
-                       else {
-                               copy_v3_v3(v4, v3);
-                       }
+                       f = l[0]->f;
+                       copy_v3_v3(v1, l[0]->v->co);
+                       copy_v3_v3(v2, l[1]->v->co);
+                       copy_v3_v3(v3, l[2]->v->co);
                        if(do_global) {
                                mul_mat3_m4_v3(ob->obmat, v1);
                                mul_mat3_m4_v3(ob->obmat, v2);
                                mul_mat3_m4_v3(ob->obmat, v3);
-                               mul_mat3_m4_v3(ob->obmat, v4); /* intentionally executed even for tri's */
-                       }
-                       
-                       e1= efa->e1;
-                       e2= efa->e2;
-                       e3= efa->e3;
-                       if(efa->e4) e4= efa->e4; else e4= e3;
-                       
-                       /* Calculate the angles */
-                               
-                       if( (e4->f & e1->f & SELECT) || (do_moving && (efa->v1->f & SELECT)) ) {
-                               /* Vec 1 */
-                               sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v4, v1, v2)));
-                               interp_v3_v3v3(fvec, efa->cent, efa->v1->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII, col);
-                       }
-                       if( (e1->f & e2->f & SELECT) || (do_moving && (efa->v2->f & SELECT)) ) {
-                               /* Vec 2 */
-                               sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v1, v2, v3)));
-                               interp_v3_v3v3(fvec, efa->cent, efa->v2->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII, col);
                        }
-                       if( (e2->f & e3->f & SELECT) || (do_moving && (efa->v3->f & SELECT)) ) {
-                               /* Vec 3 */
-                               if(efa->v4) 
-                                       sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v2, v3, v4)));
-                               else
-                                       sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v2, v3, v1)));
-                               interp_v3_v3v3(fvec, efa->cent, efa->v3->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII, col);
-                       }
-                               /* Vec 4 */
-                       if(efa->v4) {
-                               if( (e3->f & e4->f & SELECT) || (do_moving && (efa->v4->f & SELECT)) ) {
-                                       sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v3, v4, v1)));
-                                       interp_v3_v3v3(fvec, efa->cent, efa->v4->co, 0.8f);
+                       area += area_tri_v3(v1, v2, v3);
+                       add_v3_v3(vmid, v1);
+                       add_v3_v3(vmid, v2);
+                       add_v3_v3(vmid, v3);
+                       n += 3;
+               }
+
+               if(f){
+                       DRAW_EM_MEASURE_STATS_FACEAREA();
+               }
+#undef DRAW_EM_MEASURE_STATS_FACEAREA
+       }
+
+       if(me->drawflag & ME_DRAWEXTRA_FACEANG) {
+               BMFace *efa;
+
+               UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
+
+
+               for(efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL);
+                   efa; efa=BMIter_Step(&iter)) {
+                       BMIter liter;
+                       BMLoop *loop;
+
+                       BM_Compute_Face_Center(em->bm, efa, vmid);
+
+                       for(loop = BMIter_New(&liter, em->bm, BM_LOOPS_OF_FACE, efa);
+                           loop; loop = BMIter_Step(&liter)) {
+
+                               float v1[3], v2[3], v3[3];
+
+                               copy_v3_v3(v1, loop->prev->v->co);
+                               copy_v3_v3(v2, loop->v->co);
+                               copy_v3_v3(v3, loop->next->v->co);
+
+                               if(do_global){
+                                       mul_mat3_m4_v3(ob->obmat, v1);
+                                       mul_mat3_m4_v3(ob->obmat, v2);
+                                       mul_mat3_m4_v3(ob->obmat, v3);
+                               }
+
+                               if(BM_TestHFlag(efa, BM_SELECT) ||
+                                       (do_moving && BM_TestHFlag(loop->v, BM_SELECT))){
+                                       sprintf(val,"%.3g", RAD2DEGF(angle_v3v3v3(v1, v2, v3)));
+                                       interp_v3_v3v3(fvec, vmid, v2, 0.8f);
                                        view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII, col);
                                }
                        }
@@ -2443,12 +2507,32 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        /* useful for debugging index vs shape key index */
 #if 0
        {
-               EditVert *eve;
-               int j;
+               BMIter iter;
+               BMVert *eve;
+               int j=0;
+
                UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
-               for(eve= em->verts.first, j= 0; eve; eve= eve->next, j++) {
-                       sprintf(val, "%d:%d", j, eve->keyindex);
-                       view3d_cached_text_draw_add(eve->co, val, 0, V3D_CACHE_TEXT_ASCII, col);
+
+               if(CustomData_has_layer(&em->bm->vdata, CD_SHAPE_KEYINDEX)) {
+                       int *keyi;
+                       BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+                               keyi = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX);
+                               if(keyi && *keyi != ORIGINDEX_NONE) {
+                                       sprintf(val, "%d:%d", j, *keyi);
+                               }
+                               else {
+                                       sprintf(val, "%d", j);
+                               }
+                               view3d_cached_text_draw_add(eve->co, val, 0, V3D_CACHE_TEXT_ASCII, col);
+                               i++;
+                       }
+               }
+               else {
+                       BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+                               sprintf(val, "%d", j);
+                               view3d_cached_text_draw_add(eve->co, val, 0, V3D_CACHE_TEXT_ASCII, col);
+                               j++;
+                       }
                }
        }
 #endif
@@ -2459,11 +2543,11 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        }
 }
 
-static int draw_em_fancy__setFaceOpts(void *UNUSED(userData), int index, int *UNUSED(drawSmooth_r))
+static int draw_em_fancy__setFaceOpts(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
-       EditFace *efa = EM_get_face_for_index(index);
+       BMFace *efa = EDBM_get_face_for_index(userData, index);
 
-       if (efa->h==0) {
+       if (efa && !BM_TestHFlag(efa, BM_HIDDEN)) {
                GPU_enable_material(efa->mat_nr+1, NULL);
                return 1;
        }
@@ -2471,33 +2555,35 @@ static int draw_em_fancy__setFaceOpts(void *UNUSED(userData), int index, int *UN
                return 0;
 }
 
-static int draw_em_fancy__setGLSLFaceOpts(void *UNUSED(userData), int index)
+static int draw_em_fancy__setGLSLFaceOpts(void *userData, int index)
 {
-       EditFace *efa = EM_get_face_for_index(index);
+       BMFace *efa = EDBM_get_face_for_index(userData, index);
 
-       return (efa->h==0);
+       return !BM_TestHFlag(efa, BM_HIDDEN);
 }
 
-static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, EditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, int dt)
+static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob,
+                         BMEditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, int dt)
+
 {
        Mesh *me = ob->data;
-       EditFace *efa_act = EM_get_actFace(em, 0); /* annoying but active faces is stored differently */
-       EditEdge *eed_act = NULL;
-       EditVert *eve_act = NULL;
+       BMFace *efa_act = BM_get_actFace(em->bm, 0); /* annoying but active faces is stored differently */
+       BMEdge *eed_act = NULL;
+       BMVert *eve_act = NULL;
        
-       if (em->selected.last) {
-               EditSelection *ese = em->selected.last;
+       if (em->bm->selected.last) {
+               BMEditSelection *ese = em->bm->selected.last;
                /* face is handeled above */
-               /*if (ese->type == EDITFACE ) {
-                       efa_act = (EditFace *)ese->data;
-               } else */ if ( ese->type == EDITEDGE ) {
-                       eed_act = (EditEdge *)ese->data;
-               } else if ( ese->type == EDITVERT ) {
-                       eve_act = (EditVert *)ese->data;
+               /*if (ese->type == BM_FACE ) {
+                       efa_act = (BMFace *)ese->data;
+               } else */ if ( ese->type == BM_EDGE ) {
+                       eed_act = (BMEdge *)ese->data;
+               } else if ( ese->type == BM_VERT ) {
+                       eve_act = (BMVert *)ese->data;
                }
        }
        
-       EM_init_index_arrays(em, 1, 1, 1);
+       EDBM_init_index_arrays(em, 1, 1, 1);
 
        if(dt>OB_WIRE) {
                if(CHECK_OB_DRAWTEXTURE(v3d, dt)) {
@@ -2505,7 +2591,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                                glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
 
                                finalDM->drawMappedFacesGLSL(finalDM, GPU_enable_material,
-                                       draw_em_fancy__setGLSLFaceOpts, NULL);
+                                       draw_em_fancy__setGLSLFaceOpts, em);
                                GPU_disable_material();
 
                                glFrontFace(GL_CCW);
@@ -2520,8 +2606,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
 
                        glEnable(GL_LIGHTING);
                        glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
-
-                       finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, NULL, 0, GPU_enable_material, NULL);
+                       finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, me->edit_btmesh, 0, GPU_enable_material, NULL);
 
                        glFrontFace(GL_CCW);
                        glDisable(GL_LIGHTING);
@@ -2555,7 +2640,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                if CHECK_OB_DRAWTEXTURE(v3d, dt)
                        col1[3] = 0;
                
-               draw_dm_faces_sel(cageDM, col1, col2, col3, efa_act);
+               draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act, me);
 
                glDisable(GL_BLEND);
                glDepthMask(1);         // restore write in zbuffer
@@ -2570,7 +2655,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                glEnable(GL_BLEND);
                glDepthMask(0);         // disable write in zbuffer, needed for nice transp
                
-               draw_dm_faces_sel(cageDM, col1, col2, col3, efa_act);
+               draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act, me);
 
                glDisable(GL_BLEND);
                glDepthMask(1);         // restore write in zbuffer
@@ -2582,14 +2667,14 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                /* we are drawing textures and 'ME_DRAWEDGES' is disabled, dont draw any edges */
                
                /* only draw selected edges otherwise there is no way of telling if a face is selected */
-               draw_em_fancy_edges(scene, v3d, me, cageDM, 1, eed_act);
+               draw_em_fancy_edges(em, scene, v3d, me, cageDM, 1, eed_act);
                
        } else {
                if(me->drawflag & ME_DRAWSEAMS) {
                        UI_ThemeColor(TH_EDGE_SEAM);
                        glLineWidth(2);
        
-                       draw_dm_edges_seams(cageDM);
+                       draw_dm_edges_seams(em, cageDM);
        
                        glColor3ub(0,0,0);
                        glLineWidth(1);
@@ -2599,33 +2684,33 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                        UI_ThemeColor(TH_EDGE_SHARP);
                        glLineWidth(2);
        
-                       draw_dm_edges_sharp(cageDM);
+                       draw_dm_edges_sharp(em, cageDM);
        
                        glColor3ub(0,0,0);
                        glLineWidth(1);
                }
        
-               if(me->drawflag & ME_DRAWCREASES) {
-                       draw_dm_creases(cageDM);
+               if(me->drawflag & ME_DRAWCREASES && CustomData_has_layer(&em->bm->edata, CD_CREASE)) {
+                       draw_dm_creases(em, cageDM);
                }
                if(me->drawflag & ME_DRAWBWEIGHTS) {
-                       draw_dm_bweights(scene, cageDM);
+                       draw_dm_bweights(em, scene, cageDM);
                }
-       
-               draw_em_fancy_edges(scene, v3d, me, cageDM, 0, eed_act);
+
+               draw_em_fancy_edges(em, scene, v3d, me, cageDM, 0, eed_act);
        }
        if(em) {
 // XXX         retopo_matrix_update(v3d);
 
-               draw_em_fancy_verts(scene, v3d, ob, cageDM, eve_act);
+               draw_em_fancy_verts(scene, v3d, ob, em, cageDM, eve_act);
 
                if(me->drawflag & ME_DRAWNORMALS) {
                        UI_ThemeColor(TH_NORMAL);
-                       draw_dm_face_normals(scene, cageDM);
+                       draw_dm_face_normals(em, scene, cageDM);
                }
                if(me->drawflag & ME_DRAW_VNORMALS) {
                        UI_ThemeColor(TH_VNORMAL);
-                       draw_dm_vert_normals(scene, cageDM);
+                       draw_dm_vert_normals(em, scene, cageDM);
                }
 
                if(me->drawflag & (ME_DRAWEXTRA_EDGELEN|ME_DRAWEXTRA_FACEAREA|ME_DRAWEXTRA_FACEANG) && !((v3d->flag2 & V3D_RENDER_OVERRIDE)))
@@ -2638,7 +2723,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                GPU_disable_material();
        }
 
-       EM_free_index_arrays();
+       EDBM_free_index_arrays(em);
 }
 
 /* Mesh drawing routines */
@@ -2693,7 +2778,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        
        /* totvert = dm->getNumVerts(dm); */ /*UNUSED*/
        totedge = dm->getNumEdges(dm);
-       totface = dm->getNumFaces(dm);
+       totface = dm->getNumTessFaces(dm);
        
        /* vertexpaint, faceselect wants this, but it doesnt work for shaded? */
        if(dt!=OB_SHADED)
@@ -2924,7 +3009,7 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        Object *ob= base->object;
        Object *obedit= scene->obedit;
        Mesh *me= ob->data;
-       EditMesh *em= me->edit_mesh;
+       BMEditMesh *em= me->edit_btmesh;
        int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha, i;
 
        /* If we are drawing shadows and any of the materials don't cast a shadow,
@@ -2948,9 +3033,9 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                DerivedMesh *finalDM, *cageDM;
                
                if (obedit!=ob)
-                       finalDM = cageDM = editmesh_get_derived_base(ob, em);
+                       finalDM = cageDM = editbmesh_get_derived_base(ob, em);
                else
-                       cageDM = editmesh_get_derived_cage_and_final(scene, ob, em, &finalDM,
+                       cageDM = editbmesh_get_derived_cage_and_final(scene, ob, em, &finalDM,
                                                                                        scene->customdata_mask);
 
                if(dt>OB_WIRE) {
@@ -6557,44 +6642,51 @@ static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *dm, int offset)
 
 static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
-       int offset = (intptr_t) userData;
-       EditVert *eve = EM_get_vert_for_index(index);
+       void **ptrs = userData;
+       int offset = (intptr_t) ptrs[0];
+       BMVert *eve = EDBM_get_vert_for_index(ptrs[1], index);
 
-       if (eve->h==0) {
+       if (!BM_TestHFlag(eve, BM_HIDDEN)) {
                WM_set_framebuffer_index_color(offset+index);
                bglVertex3fv(co);
        }
 }
-static void bbs_mesh_verts(DerivedMesh *dm, int offset)
+static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
+       void *ptrs[2] = {(void*)(intptr_t) offset, em};
+
        glPointSize( UI_GetThemeValuef(TH_VERTEX_SIZE) );
        bglBegin(GL_POINTS);
-       dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, (void*)(intptr_t) offset);
+       dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, ptrs);
        bglEnd();
        glPointSize(1.0);
 }              
 
 static int bbs_mesh_wire__setDrawOptions(void *userData, int index)
 {
-       int offset = (intptr_t) userData;
-       EditEdge *eed = EM_get_edge_for_index(index);
+       void **ptrs = userData;
+       int offset = (intptr_t) ptrs[0];
+       BMEdge *eed = EDBM_get_edge_for_index(ptrs[1], index);
 
-       if (eed->h==0) {
+       if (!BM_TestHFlag(eed, BM_HIDDEN)) {
                WM_set_framebuffer_index_color(offset+index);
                return 1;
        } else {
                return 0;
        }
 }
-static void bbs_mesh_wire(DerivedMesh *dm, int offset)
+static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
-       dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, (void*)(intptr_t) offset);
+       void *ptrs[2] = {(void*)(intptr_t) offset, em};
+       dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, ptrs);
 }              
 
 static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
-       if (EM_get_face_for_index(index)->h==0) {
-               if (userData) {
+       BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index);
+       
+       if (efa && !BM_TestHFlag(efa, BM_HIDDEN)) {
+               if (((void**)userData)[1]) {
                        WM_set_framebuffer_index_color(index+1);
                }
                return 1;
@@ -6603,11 +6695,11 @@ static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *U
        }
 }
 
-static void bbs_mesh_solid__drawCenter(void *UNUSED(userData), int index, float *cent, float *UNUSED(no))
+static void bbs_mesh_solid__drawCenter(void *userData, int index, float *cent, float *UNUSED(no))
 {
-       EditFace *efa = EM_get_face_for_index(index);
+       BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index);
 
-       if (efa->h==0 && efa->fgonf!=EM_FGON) {
+       if (!BM_TestHFlag(efa, BM_HIDDEN)) {
                WM_set_framebuffer_index_color(index+1);
 
                bglVertex3fv(cent);
@@ -6615,23 +6707,26 @@ static void bbs_mesh_solid__drawCenter(void *UNUSED(userData), int index, float
 }
 
 /* two options, facecolors or black */
-static void bbs_mesh_solid_EM(Scene *scene, View3D *v3d, Object *ob, DerivedMesh *dm, int facecol)
+static void bbs_mesh_solid_EM(BMEditMesh *em, Scene *scene, View3D *v3d,
+                             Object *ob, DerivedMesh *dm, int facecol)
 {
+       void *ptrs[2] = {em, NULL}; //second one being null means to draw black
        cpack(0);
 
        if (facecol) {
-               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(intptr_t) 1, 0, GPU_enable_material, NULL);
+               ptrs[1] = (void*)(intptr_t) 1;
+               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, ptrs, 0, GPU_enable_material, NULL);
 
                if(check_ob_drawface_dot(scene, v3d, ob->dt)) {
                        glPointSize(UI_GetThemeValuef(TH_FACEDOT_SIZE));
                
                        bglBegin(GL_POINTS);
-                       dm->foreachMappedFaceCenter(dm, bbs_mesh_solid__drawCenter, NULL);
+                       dm->foreachMappedFaceCenter(dm, bbs_mesh_solid__drawCenter, ptrs);
                        bglEnd();
                }
 
        } else {
-               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*) 0, 0, GPU_enable_material, NULL);
+               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, ptrs, 0, GPU_enable_material, NULL);
        }
 }
 
@@ -6690,36 +6785,36 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
        case OB_MESH:
                if(ob->mode & OB_MODE_EDIT) {
                        Mesh *me= ob->data;
-                       EditMesh *em= me->edit_mesh;
+                       BMEditMesh *em= me->edit_btmesh;
 
-                       DerivedMesh *dm = editmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
+                       DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
 
-                       EM_init_index_arrays(em, 1, 1, 1);
+                       EDBM_init_index_arrays(em, 1, 1, 1);
 
-                       bbs_mesh_solid_EM(scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE);
+                       bbs_mesh_solid_EM(em, scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE);
                        if(ts->selectmode & SCE_SELECT_FACE)
-                               em_solidoffs = 1+em->totface;
+                               bm_solidoffs = 1+em->bm->totface;
                        else
-                               em_solidoffs= 1;
+                               bm_solidoffs= 1;
                        
                        bglPolygonOffset(rv3d->dist, 1.0);
                        
                        // we draw edges always, for loop (select) tools
-                       bbs_mesh_wire(dm, em_solidoffs);
-                       em_wireoffs= em_solidoffs + em->totedge;
+                       bbs_mesh_wire(em, dm, bm_solidoffs);
+                       bm_wireoffs= bm_solidoffs + em->bm->totedge;
                        
                        // we draw verts if vert select mode or if in transform (for snap).
                        if(ts->selectmode & SCE_SELECT_VERTEX || G.moving & G_TRANSFORM_EDIT) {
-                               bbs_mesh_verts(dm, em_wireoffs);
-                               em_vertoffs= em_wireoffs + em->totvert;
+                               bbs_mesh_verts(em, dm, bm_wireoffs);
+                               bm_vertoffs= bm_wireoffs + em->bm->totvert;
                        }
-                       else em_vertoffs= em_wireoffs;
+                       else bm_vertoffs= bm_wireoffs;
                        
                        bglPolygonOffset(rv3d->dist, 0.0);
 
                        dm->release(dm);
 
-                       EM_free_index_arrays();
+                       EDBM_free_index_arrays(em);
                }
                else {
                        Mesh *me= ob->data;
@@ -6731,7 +6826,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 
                                
                                bbs_obmode_mesh_verts(ob, dm, 1);
-                               em_vertoffs = me->totvert+1;
+                               bm_vertoffs = me->totvert+1;
                                dm->release(dm);
                        }
                        else {
@@ -6760,7 +6855,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
        int glsl;
        
        if(ob->mode & OB_MODE_EDIT)
-               edm= editmesh_get_derived_base(ob, me->edit_mesh);
+               edm= editbmesh_get_derived_base(ob, me->edit_btmesh);
        else 
                dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);