code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc ->...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 13 Apr 2013 20:31:52 +0000 (20:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 13 Apr 2013 20:31:52 +0000 (20:31 +0000)
74 files changed:
source/blender/blenkernel/BKE_editmesh.h [moved from source/blender/blenkernel/BKE_tessmesh.h with 97% similarity]
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifiers_bmesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_bevel.c
source/blender/editors/mesh/editmesh_bvh.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/mesh/editmesh_inset.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/mesh/editmesh_knife_project.c
source/blender/editors/mesh/editmesh_loopcut.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/crazyspace.c
source/blender/editors/uvedit/uvedit_buttons.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_laplaciansmooth.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_triangulate.c
source/blender/python/bmesh/bmesh_py_api.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/bmesh/bmesh_py_types_select.c

similarity index 97%
rename from source/blender/blenkernel/BKE_tessmesh.h
rename to source/blender/blenkernel/BKE_editmesh.h
index 7d67425149d7e7e2b04acc26ab2641bb15c33983..824ecd482e8a585706524f5550ea0b4db85ef6cd 100644 (file)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BKE_TESSMESH_H__
-#define __BKE_TESSMESH_H__
+#ifndef __BKE_EDITMESH_H__
+#define __BKE_EDITMESH_H__
 
 #include "BKE_customdata.h"
 #include "bmesh.h"
@@ -91,4 +91,4 @@ BMEditMesh *BMEdit_FromObject(struct Object *ob);
 void BMEdit_Free(BMEditMesh *em);
 void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
 
-#endif /* __BKE_TESSMESH_H__ */
+#endif /* __BKE_EDITMESH_H__ */
index 875f02def13b139798bdbdf5a516b85541a5705d..f78c7045e58b09f75702bf2040999fb1c3de2010 100644 (file)
@@ -236,7 +236,7 @@ set(SRC
        BKE_speaker.h
        BKE_subsurf.h
        BKE_suggestions.h
-       BKE_tessmesh.h
+       BKE_editmesh.h
        BKE_text.h
        BKE_texture.h
        BKE_tracking.h
index 2bef2d7e190333e95b61f4e6b65539c96a8f9e9a..ba0003f82b90173672cf4ce03394798df215e1b4 100644 (file)
@@ -63,7 +63,7 @@
 #include "BKE_multires.h"
 #include "BKE_armature.h"
 #include "BKE_particle.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_bvhutils.h"
 #include "BKE_deform.h"
 #include "BKE_global.h" /* For debug flag, DM_update_tessface_data() func. */
index 8c49ce22deafbc09284046fb0a8bc94685b85ce5..c555b7de5d9bf3f871594b360702a76b7e2b4f91 100644 (file)
@@ -65,7 +65,7 @@
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_depsgraph.h"
 #include "BKE_anim.h"
 #include "BKE_report.h"
index 5028d97835111fd9ee369c793cece25a38a96b42..e44b1f4536ef164895f2f1314a757b3d1ac869db 100644 (file)
@@ -41,7 +41,7 @@
 #include "BLI_math.h"
 
 #include "BKE_DerivedMesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "MEM_guardedalloc.h"
 
index 0469e6ea78710b95d7678036fdfdfe3ee9aa09f7..1a3f5a700b9fbca7e7434b41a337c4f9d44f66d6 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_paint.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_curve.h"
 
 #include "DNA_mesh_types.h"
index 12fa16e32730253807af429f7711910ea96622ce..265cbe1321745e2f4d9c0bc9dd240ea10e3ed3b2 100644 (file)
@@ -81,7 +81,7 @@
 #include "BKE_mesh.h"
 #include "BKE_shrinkwrap.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_tracking.h"
 #include "BKE_movieclip.h"
 
index e723ea9e813cd88c6e19d9177577df6698dcf21a..f01b550ff7a16afdba13cbf23b0540e2da4f0fe5 100644 (file)
@@ -59,7 +59,7 @@
 #include "GPU_material.h"
 
 /* bmesh */
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BLI_array.h"
 #include "BLI_scanfill.h"
 
@@ -365,8 +365,7 @@ void BMEdit_Free(BMEditMesh *em)
 typedef struct EditDerivedBMesh {
        DerivedMesh dm;
 
-       Object *ob;
-       BMEditMesh *tc;
+       BMEditMesh *em;
 
        float (*vertexCos)[3];
        float (*vertexNos)[3];
@@ -398,12 +397,12 @@ static void emDM_foreachMappedVert(DerivedMesh *dm,
        int i;
 
        if (bmdm->vertexCos) {
-               BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH, i) {
                        func(userData, i, bmdm->vertexCos[i], bmdm->vertexNos[i], NULL);
                }
        }
        else {
-               BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH, i) {
                        func(userData, i, eve->co, eve->no, NULL);
                }
        }
@@ -419,16 +418,16 @@ static void emDM_foreachMappedEdge(DerivedMesh *dm,
 
        if (bmdm->vertexCos) {
 
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_VERT);
 
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        func(userData, i,
                             bmdm->vertexCos[BM_elem_index_get(eed->v1)],
                             bmdm->vertexCos[BM_elem_index_get(eed->v2)]);
                }
        }
        else {
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        func(userData, i, eed->v1->co, eed->v2->co);
                }
        }
@@ -445,10 +444,10 @@ static void emDM_drawMappedEdges(DerivedMesh *dm,
 
        if (bmdm->vertexCos) {
 
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_VERT);
 
                glBegin(GL_LINES);
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
                                glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]);
                                glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v2)]);
@@ -458,7 +457,7 @@ static void emDM_drawMappedEdges(DerivedMesh *dm,
        }
        else {
                glBegin(GL_LINES);
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
                                glVertex3fv(eed->v1->co);
                                glVertex3fv(eed->v2->co);
@@ -486,10 +485,10 @@ static void emDM_drawMappedEdgesInterp(DerivedMesh *dm,
 
        if (bmdm->vertexCos) {
 
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_VERT);
 
                glBegin(GL_LINES);
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
                                setDrawInterpOptions(userData, i, 0.0);
                                glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]);
@@ -501,7 +500,7 @@ static void emDM_drawMappedEdgesInterp(DerivedMesh *dm,
        }
        else {
                glBegin(GL_LINES);
-               BM_ITER_MESH_INDEX (eed, &iter, bmdm->tc->bm, BM_EDGES_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eed, &iter, bmdm->em->bm, BM_EDGES_OF_MESH, i) {
                        if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
                                setDrawInterpOptions(userData, i, 0.0);
                                glVertex3fv(eed->v1->co);
@@ -516,7 +515,7 @@ static void emDM_drawMappedEdgesInterp(DerivedMesh *dm,
 static void emDM_drawUVEdges(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMEditMesh *em = bmdm->tc;
+       BMEditMesh *em = bmdm->em;
        BMFace *efa;
        BMIter iter;
 
@@ -591,13 +590,13 @@ static void emDM_foreachMappedFaceCenter(DerivedMesh *dm,
 
        /* ensure for face center calculation */
        if (bmdm->vertexCos) {
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_VERT);
                polyNos = bmdm->polyNos;
 
                BLI_assert(polyNos != NULL);
        }
 
-       BM_ITER_MESH_INDEX (efa, &iter, bmdm->tc->bm, BM_FACES_OF_MESH, i) {
+       BM_ITER_MESH_INDEX (efa, &iter, bmdm->em->bm, BM_FACES_OF_MESH, i) {
                emDM__calcFaceCent(efa, cent, bmdm->vertexCos);
                func(userData, i, cent, polyNos ? polyNos[i] : efa->no);
        }
@@ -611,11 +610,11 @@ static void emDM_drawMappedFaces(DerivedMesh *dm,
                                  DMDrawFlag flag)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMEditMesh *em = bmdm->tc;
+       BMEditMesh *em = bmdm->em;
        BMesh *bm = em->bm;
        BMFace *efa;
-       struct BMLoop *(*looptris)[3] = bmdm->tc->looptris;
-       const int tottri = bmdm->tc->tottri;
+       struct BMLoop *(*looptris)[3] = bmdm->em->looptris;
+       const int tottri = bmdm->em->tottri;
        const int lasttri = tottri - 1; /* compare agasint this a lot */
        DMDrawOption draw_option;
        int i, flush;
@@ -649,7 +648,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm,
                float (*polyNos)[3]   = bmdm->polyNos;
                // int *triPolyMap = bmdm->triPolyMap;
 
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT | BM_FACE);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_VERT | BM_FACE);
 
                for (i = 0; i < tottri; i++) {
                        BMLoop **ltri = looptris[i];
@@ -734,7 +733,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm,
                }
        }
        else {
-               BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_FACE);
+               BM_mesh_elem_index_ensure(bmdm->em->bm, BM_FACE);
 
                for (i = 0; i < tottri; i++) {
                        BMLoop **ltri = looptris[i];
@@ -852,8 +851,8 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
                                      void *userData)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMEditMesh *em = bmdm->tc;
-       BMesh *bm = bmdm->tc->bm;
+       BMEditMesh *em = bmdm->em;
+       BMesh *bm = em->bm;
        struct BMLoop *(*looptris)[3] = em->looptris;
        float (*vertexCos)[3] = bmdm->vertexCos;
        float (*vertexNos)[3] = bmdm->vertexNos;
@@ -1082,8 +1081,8 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
                                      void *userData)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
-       BMEditMesh *em = bmdm->tc;
+       BMEditMesh *em = bmdm->em;
+       BMesh *bm = em->bm;
        struct BMLoop *(*looptris)[3] = em->looptris;
        float (*vertexCos)[3] = bmdm->vertexCos;
        float (*vertexNos)[3] = bmdm->vertexNos;
@@ -1217,8 +1216,8 @@ static void emDM_drawMappedFacesMat(DerivedMesh *dm,
                                     int (*setFace)(void *userData, int index), void *userData)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
-       BMEditMesh *em = bmdm->tc;
+       BMEditMesh *em = bmdm->em;
+       BMesh *bm = em->bm;
        struct BMLoop *(*looptris)[3] = em->looptris;
        float (*vertexCos)[3] = bmdm->vertexCos;
        float (*vertexNos)[3] = bmdm->vertexNos;
@@ -1314,14 +1313,14 @@ static void emDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3])
        BMIter iter;
        int i;
 
-       if (bmdm->tc->bm->totvert) {
+       if (bmdm->em->bm->totvert) {
                if (bmdm->vertexCos) {
-                       BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
+                       BM_ITER_MESH_INDEX (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH, i) {
                                minmax_v3v3_v3(min_r, max_r, bmdm->vertexCos[i]);
                        }
                }
                else {
-                       BM_ITER_MESH (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH) {
+                       BM_ITER_MESH (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH) {
                                minmax_v3v3_v3(min_r, max_r, eve->co);
                        }
                }
@@ -1335,35 +1334,35 @@ static int emDM_getNumVerts(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return bmdm->tc->bm->totvert;
+       return bmdm->em->bm->totvert;
 }
 
 static int emDM_getNumEdges(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return bmdm->tc->bm->totedge;
+       return bmdm->em->bm->totedge;
 }
 
 static int emDM_getNumTessFaces(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return bmdm->tc->tottri;
+       return bmdm->em->tottri;
 }
 
 static int emDM_getNumLoops(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return bmdm->tc->bm->totloop;
+       return bmdm->em->bm->totloop;
 }
 
 static int emDM_getNumPolys(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return bmdm->tc->bm->totface;
+       return bmdm->em->bm->totface;
 }
 
 static int bmvert_to_mvert(BMesh *bm, BMVert *ev, MVert *vert_r)
@@ -1393,10 +1392,10 @@ static void emDM_getVert(DerivedMesh *dm, int index, MVert *vert_r)
                return;
        }
 
-       ev = bmdm->tc->vert_index[index];  /* should be EDBM_vert_at_index() */
-       // ev = BM_vert_at_index(bmdm->tc->bm, index); /* warning, does list loop, _not_ ideal */
+       ev = bmdm->em->vert_index[index];  /* should be EDBM_vert_at_index() */
+       // ev = BM_vert_at_index(bmdm->em->bm, index); /* warning, does list loop, _not_ ideal */
 
-       bmvert_to_mvert(bmdm->tc->bm, ev, vert_r);
+       bmvert_to_mvert(bmdm->em->bm, ev, vert_r);
        if (bmdm->vertexCos)
                copy_v3_v3(vert_r->co, bmdm->vertexCos[index]);
 }
@@ -1404,7 +1403,7 @@ static void emDM_getVert(DerivedMesh *dm, int index, MVert *vert_r)
 static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
+       BMesh *bm = bmdm->em->bm;
        BMEdge *e;
        float *f;
 
@@ -1413,8 +1412,8 @@ static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
                return;
        }
 
-       e = bmdm->tc->edge_index[index];  /* should be EDBM_edge_at_index() */
-       // e = BM_edge_at_index(bmdm->tc->bm, index); /* warning, does list loop, _not_ ideal */
+       e = bmdm->em->edge_index[index];  /* should be EDBM_edge_at_index() */
+       // e = BM_edge_at_index(bmdm->em->bm, index); /* warning, does list loop, _not_ ideal */
 
        edge_r->flag = BM_edge_flag_to_mflag(e);
 
@@ -1440,7 +1439,7 @@ static void emDM_getTessFace(DerivedMesh *dm, int index, MFace *face_r)
                return;
        }
 
-       ltri = bmdm->tc->looptris[index];
+       ltri = bmdm->em->looptris[index];
 
        ef = ltri[0]->f;
 
@@ -1458,7 +1457,7 @@ static void emDM_getTessFace(DerivedMesh *dm, int index, MFace *face_r)
 static void emDM_copyVertArray(DerivedMesh *dm, MVert *vert_r)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
+       BMesh *bm = bmdm->em->bm;
        BMVert *eve;
        BMIter iter;
        const int cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT);
@@ -1491,7 +1490,7 @@ static void emDM_copyVertArray(DerivedMesh *dm, MVert *vert_r)
 
 static void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
 {
-       BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm;
+       BMesh *bm = ((EditDerivedBMesh *)dm)->em->bm;
        BMEdge *eed;
        BMIter iter;
 
@@ -1516,14 +1515,14 @@ static void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
 static void emDM_copyTessFaceArray(DerivedMesh *dm, MFace *face_r)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
-       struct BMLoop *(*looptris)[3] = bmdm->tc->looptris;
+       BMesh *bm = bmdm->em->bm;
+       struct BMLoop *(*looptris)[3] = bmdm->em->looptris;
        BMFace *ef;
        int i;
 
        BM_mesh_elem_index_ensure(bm, BM_VERT);
 
-       for (i = 0; i < bmdm->tc->tottri; i++, face_r++) {
+       for (i = 0; i < bmdm->em->tottri; i++, face_r++) {
                BMLoop **ltri = looptris[i];
                ef = ltri[0]->f;
 
@@ -1544,7 +1543,7 @@ static void emDM_copyTessFaceArray(DerivedMesh *dm, MFace *face_r)
 static void emDM_copyLoopArray(DerivedMesh *dm, MLoop *loop_r)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
+       BMesh *bm = bmdm->em->bm;
        BMIter iter, liter;
        BMFace *efa;
        BMLoop *l;
@@ -1563,7 +1562,7 @@ static void emDM_copyLoopArray(DerivedMesh *dm, MLoop *loop_r)
 static void emDM_copyPolyArray(DerivedMesh *dm, MPoly *poly_r)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
+       BMesh *bm = bmdm->em->bm;
        BMIter iter;
        BMFace *efa;
        int i;
@@ -1583,7 +1582,7 @@ static void emDM_copyPolyArray(DerivedMesh *dm, MPoly *poly_r)
 static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-       BMesh *bm = bmdm->tc->bm;
+       BMesh *bm = bmdm->em->bm;
        void *datalayer;
 
        datalayer = DM_get_tessface_data_layer(dm, type);
@@ -1610,20 +1609,20 @@ static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type)
                        data = datalayer = DM_get_tessface_data_layer(dm, type);
 
                        if (type == CD_MTFACE) {
-                               for (i = 0; i < bmdm->tc->tottri; i++, data += size) {
-                                       BMFace *efa = bmdm->tc->looptris[i][0]->f;
+                               for (i = 0; i < bmdm->em->tottri; i++, data += size) {
+                                       BMFace *efa = bmdm->em->looptris[i][0]->f;
                                        bmdata = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY);
                                        ME_MTEXFACE_CPY(((MTFace *)data), ((MTexPoly *)bmdata));
                                        for (j = 0; j < 3; j++) {
-                                               bmdata = CustomData_bmesh_get(&bm->ldata, bmdm->tc->looptris[i][j]->head.data, CD_MLOOPUV);
+                                               bmdata = CustomData_bmesh_get(&bm->ldata, bmdm->em->looptris[i][j]->head.data, CD_MLOOPUV);
                                                copy_v2_v2(((MTFace *)data)->uv[j], ((MLoopUV *)bmdata)->uv);
                                        }
                                }
                        }
                        else {
-                               for (i = 0; i < bmdm->tc->tottri; i++, data += size) {
+                               for (i = 0; i < bmdm->em->tottri; i++, data += size) {
                                        for (j = 0; j < 3; j++) {
-                                               bmdata = CustomData_bmesh_get(&bm->ldata, bmdm->tc->looptris[i][j]->head.data, CD_MLOOPCOL);
+                                               bmdata = CustomData_bmesh_get(&bm->ldata, bmdm->em->looptris[i][j]->head.data, CD_MLOOPCOL);
                                                MESH_MLOOPCOL_TO_MCOL(((MLoopCol *)bmdata), (((MCol *)data) + j));
                                        }
                                }
@@ -1642,12 +1641,12 @@ static void emDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
        int i;
 
        if (emdm->vertexCos) {
-               BM_ITER_MESH_INDEX (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, emdm->em->bm, BM_VERTS_OF_MESH, i) {
                        copy_v3_v3(cos_r[i], emdm->vertexCos[i]);
                }
        }
        else {
-               BM_ITER_MESH_INDEX (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, emdm->em->bm, BM_VERTS_OF_MESH, i) {
                        copy_v3_v3(cos_r[i], eve->co);
                }
        }
@@ -1672,14 +1671,14 @@ static CustomData *bmDm_getVertDataLayout(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return &bmdm->tc->bm->vdata;
+       return &bmdm->em->bm->vdata;
 }
 
 static CustomData *bmDm_getEdgeDataLayout(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return &bmdm->tc->bm->edata;
+       return &bmdm->em->bm->edata;
 }
 
 static CustomData *bmDm_getTessFaceDataLayout(DerivedMesh *dm)
@@ -1693,14 +1692,14 @@ static CustomData *bmDm_getLoopDataLayout(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return &bmdm->tc->bm->ldata;
+       return &bmdm->em->bm->ldata;
 }
 
 static CustomData *bmDm_getPolyDataLayout(DerivedMesh *dm)
 {
        EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 
-       return &bmdm->tc->bm->pdata;
+       return &bmdm->em->bm->pdata;
 }
 
 
@@ -1711,7 +1710,7 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em,
        EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), __func__);
        BMesh *bm = em->bm;
 
-       bmdm->tc = em;
+       bmdm->em = em;
 
        DM_init((DerivedMesh *)bmdm, DM_TYPE_EDITBMESH, em->bm->totvert,
                em->bm->totedge, em->tottri, em->bm->totloop, em->bm->totface);
@@ -1774,7 +1773,7 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em,
 
                DM_add_vert_layer(&bmdm->dm, CD_MDEFORMVERT, CD_CALLOC, NULL);
 
-               BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH, i) {
                        DM_set_vert_data(&bmdm->dm, i, CD_MDEFORMVERT,
                                         CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MDEFORMVERT));
                }
@@ -1787,7 +1786,7 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em,
 
                DM_add_vert_layer(&bmdm->dm, CD_MVERT_SKIN, CD_CALLOC, NULL);
 
-               BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
+               BM_ITER_MESH_INDEX (eve, &iter, bmdm->em->bm, BM_VERTS_OF_MESH, i) {
                        DM_set_vert_data(&bmdm->dm, i, CD_MVERT_SKIN,
                                         CustomData_bmesh_get(&bm->vdata, eve->head.data,
                                                              CD_MVERT_SKIN));
index 864c5ef3f923e459c7a2c49f6c189e23df126bdf..5c25469facc975d9dfdea69290fbd05bbf164fa7 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_deform.h"
index 39dbd34ccbefcf5780c40648f433b0abfa37e2cb..a05f8e2d37c45f65b38ec5a59eb08777ab4a22c0 100644 (file)
@@ -67,7 +67,7 @@
 #include "BKE_curve.h"
 /* -- */
 #include "BKE_object.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BLI_edgehash.h"
 
 #include "bmesh.h"
index a6c2325c740d11d06ab73efc16d2f3befb4a4ce1..e2a4130b4d97d7ff69d4ee13dd91811df2beca42 100644 (file)
@@ -38,7 +38,7 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_bmesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 /**
  * The main function for copying DerivedMesh data into BMesh.
index 88f534c581cc3c8005f10bc3eabeb2f6814d7393..c1f1ca0bbaa6b424097ca2b1f03aeb8eb8b40f3d 100644 (file)
@@ -54,7 +54,7 @@
 #include "BKE_paint.h"
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BKE_object.h"
 
index a5f05053bfcf72b26c7ae2c5c8ba30223879be77..91845178a04c6339d571a30f082e912d09a36d7e 100644 (file)
@@ -94,7 +94,7 @@
 #include "BKE_library.h"
 #include "BKE_linestyle.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_mball.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
index 72db34d339c469cad853e4de04a30d0a69b85090..100659105325bcd96b6c33a3e9205c9016781112 100644 (file)
@@ -54,7 +54,7 @@
 #include "BKE_mesh.h"
 #include "BKE_subsurf.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 /* for timing... */
 #if 0
index ba4a7b20f55c3a749c2c45b4283bacd72a7e214f..91a992ff92f5b1297ee7de9c55b8b00ae11b2be9 100644 (file)
@@ -61,7 +61,7 @@
 #include "BKE_paint.h"
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "PIL_time.h"
 #include "BLI_array.h"
index 55a22fd361341d79a2e50d3a242a23f617dc3cff..f36ac361550f17b52f3a0f0853491d264d7dba71 100644 (file)
@@ -36,7 +36,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_multires.h"
 
 #include "intern/bmesh_private.h"
index 47b507603f4adb113853aee59311504afc7f09cd..ba553e2f7637ced66ecbb7a40fcf7591ee239160 100644 (file)
@@ -38,7 +38,7 @@
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_bmesh.h"
 
 #include "bmesh.h"
index c12b2f57f1a2d55e1a5d116237d2f9aa321b2b9b..5da2f909d523436ee9fff29fe514438cc9dd4c4b 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_context.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BIF_gl.h"
 
index 34666b363f385234e411c90c13eb9af61eb74b18..be1204e2653aa9137d6d4270b1de742603ba9c71 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BKE_context.h"
 #include "BKE_library.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 3f4c3d3a21c5be3664a8dacb616e698901aac59a..316aa79af7b29454691024d06ace86cdd972b646 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 4c989a22291a5df61e4c479e0ae49528c78d1aa2..f9ef360c3bfdb682b40aedf1cca192f88e4995d4 100644 (file)
@@ -40,7 +40,7 @@
 #include "BLI_smallhash.h"
 
 #include "BKE_DerivedMesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_view3d.h"
 
index 694053ae2f78cc863f4bb83daa47584d537f8347..7eb50117b0ff3cc0715645a6b2fc1f7800fe3e0c 100644 (file)
@@ -37,7 +37,7 @@
 #include "BKE_context.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 523f4e11b81ca6834240f3a4f7bbe004a887e864..c74cf378756f1232f383ed6b389d552402831b95 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 3f1c8ced5d2856293c94515abab3fa643bc24328..063ad46b9969643f4ca9d88f9228b24b7ddf9d70 100644 (file)
@@ -60,7 +60,7 @@
 #include "WM_types.h"
 
 #include "DNA_object_types.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "UI_resources.h"
 
 #include "RNA_access.h"
index 1dae4aa51c88718cad776967d4010714a3ba2080..a5f2e54c2f93f39fb43a3028449403b06a25cf0e 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_report.h"
 
 #include "MEM_guardedalloc.h"
index 62cb1840808ad74553be365357010db00a3122bf..e0f165c77afbdeac80a9f35516c59a4e15ce045f 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_context.h"
 #include "BKE_modifier.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BIF_gl.h"
 
index 47e08bd5c7ef0e51623366aa1bef6c2ac6533db0..aef01c5b462fcd4b3d5092e27ed0dc7b9c595e0c 100644 (file)
@@ -38,7 +38,7 @@
 
 #include "BKE_context.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index dab5adda790af1460323537c8acf320383ab3d17..cb84f9a4eff25c83a7084bdf522ffc5649cc2bac 100644 (file)
@@ -42,7 +42,7 @@
 #include "BKE_displist.h"
 #include "BKE_report.h"
 #include "BKE_paint.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index 20b0bf9e64784026b5ec9ce979ac0981608627c6..33c665576c646aca609261c95c29ded7a5825bda 100644 (file)
@@ -49,7 +49,7 @@
 #include "BKE_report.h"
 #include "BKE_texture.h"
 #include "BKE_main.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 5547df89463921d2069d8a74cead4118b1d8ddf6..3266bb61c9946cad519a3f585e38ed95a370ec20 100644 (file)
@@ -42,7 +42,7 @@
 #include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BKE_object.h"  /* XXX. only for EDBM_mesh_ensure_valid_dm_hack() which will be removed */
 
index 97650b3a3184323dac2221feaf4ef7c727a6c5f1..8fbc6c7ae9d5d79d003e09fab98692aa84d37126 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index e6c36274687a56bb3292a865cd7030abf3cca622..6769301373a7705cc49e818dff41ad60c2cb6ef0 100644 (file)
@@ -43,7 +43,7 @@
 #include "BKE_scene.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_object.h"
 #include "ED_mesh.h"
index b34f43cd0821aa18f51b2139b7ea525ee266a212..9e70fe550bc930d301a1c22c4479c988a5c9ede4 100644 (file)
@@ -57,7 +57,7 @@
 #include "BKE_mesh.h"
 #include "BKE_material.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_multires.h"
 
 #include "ED_mesh.h"
index 8b2bf9c8b47d923de9230ab4b93c24beaef1589f..a3f7e0f23d94a51b163757dec09c0924b0a5aba1 100644 (file)
@@ -79,7 +79,7 @@
 #include "BKE_sca.h"
 #include "BKE_softbody.h"
 #include "BKE_modifier.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_armature.h"
 #include "ED_curve.h"
index 43736909c4006cef03d3ff3b76ba862e52fa45bf..f0ab55e1e0f5a302bef2bdc63c8a9f0396456f5b 100644 (file)
@@ -56,7 +56,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_deform.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
index 2239148ca1c96dfa67d0a2509e4410113e91674b..9e49cc64c6c83fb0b24767728767ae402a690cf9 100644 (file)
@@ -70,7 +70,7 @@
 #include "BKE_ocean.h"
 #include "BKE_particle.h"
 #include "BKE_softbody.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index e242dbfde854a71b835af3f74c19ea535cd5f9af..5a688d7daf388c5ce59a91627727c4ff5d85478c 100644 (file)
@@ -85,7 +85,7 @@
 #include "BKE_scene.h"
 #include "BKE_speaker.h"
 #include "BKE_texture.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 80d494a6a074c6aef0a2c875e6655225c33b0dfd..f62561743919b27c8679cd438b9625ac04eb83ca 100644 (file)
@@ -54,7 +54,7 @@
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_multires.h"
 #include "BKE_armature.h"
 #include "BKE_lattice.h"
index 623e23588f0f7d556a943fd36a006578c089e7cd..487a8ad4bc0b4cf44ba18b6f6a04ffb10dafc076 100644 (file)
@@ -60,7 +60,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_report.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_object_deform.h"
index 7323e4341430a57e7f72162e9c945577ae70714a..c72291156379018c9c3ac1a87dadb6ab21befb1a 100644 (file)
@@ -66,7 +66,7 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 #include "BKE_world.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index e49e7ce53ffc690ade1e62b50d49f3f6d4100062..206824d46682d18cc6c08794add9465051f6d2fe 100644 (file)
@@ -60,7 +60,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_sound.h"
 #include "BKE_mask.h"
 
index fbc71d90a93088fc4dab7c806af31e1c903a6ba8..e3adf40a7eb128c3352e3f0c3e6de96fd6a7d9bb 100644 (file)
@@ -74,7 +74,7 @@
 #include "BKE_scene.h"
 #include "BKE_colortools.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
index 5fc0cc454e26a09fbafffeb0107335bbbca1d312..14330229aba466b7594d88eddb0b565fe87e0fe8 100644 (file)
@@ -74,7 +74,7 @@
 #include "BKE_scene.h"
 #include "BKE_colortools.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
index 5f1a86fe70ce976b17859236aecbfbfbbab8402d..c8bd31d0c2a80badada7d3df0107ab2da3be044f 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 #include "BKE_customdata.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_screen.h"
 #include "ED_image.h"
index 34207e16f1c652a9f6ad4734ea020c0d0f598892..45acf25a388d4c4d54b0c033278066e480f86707 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_library.h"
 
 #include "IMB_imbuf_types.h"
index 815610ff1df5c9bea0cf2905a3afd01b1f56c1e5..dc2f764d8fdf178795dc71d222904cec13181f0b 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_global.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_sequencer.h"
 #include "BKE_node.h"
 
index b2e9427c799e43706a2fb5ba4cf5fd3378db1efd..9ec05159627136e85d926d86af7195183856602d 100644 (file)
@@ -53,7 +53,7 @@
 #include "BKE_mesh.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_info.h"
 #include "ED_armature.h"
index b13f395b80bc71e2882590cc3c8c261969e9e727..f1111abf8605237f2dd15ad2da7114ea7e7ab410 100644 (file)
@@ -56,7 +56,7 @@
 #include "BKE_material.h"
 #include "BKE_paint.h"
 #include "BKE_property.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_scene.h"
 
 #include "BIF_gl.h"
index 9f24db3c9a3baf7d4b78e6ea06b8cea4c69b0efe..bb2a18ed6c201014fd14b785d2c6cd565b8bbe56 100644 (file)
@@ -71,7 +71,7 @@
 #include "BKE_unit.h"
 #include "BKE_tracking.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index a439b5b5b87b216f7ed13e81d84abe79957ed6c6..76a32a20c1cb7f9ba632c7a4a893a88ba02174f1 100644 (file)
@@ -60,7 +60,7 @@
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_deform.h"
 #include "BKE_object.h"
 
index 854bd9f6cf857ec2cb035afbf31fd5de1e5ac8ba..b7ebee49c482187b945ba2e8900ae236be24eabb 100644 (file)
@@ -52,7 +52,7 @@
 #include "BKE_modifier.h"
 #include "BKE_paint.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index 209bb76df91014860f59399ef2ec67d156da96e7..a2529332f930462aefe4917a860fa7a6f8df4d73 100644 (file)
@@ -68,7 +68,7 @@
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_tracking.h"
 #include "BKE_utildefines.h"
 
index eb32baf4c3f8a1083c4d60840d6a2291c06ab6dd..39d00badfafd082c8c01dd70772f50146ed20683 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_scene.h"
 #include "BKE_tracking.h"
index 00289f953755be54b2ad12960af7348dba7c12e5..1440be9ff85e17c767eca80cb38dfe93c3f22d1e 100644 (file)
@@ -40,7 +40,7 @@
 #include "DNA_listBase.h"
 
 #include "BLI_smallhash.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 /* ************************** Types ***************************** */
 
index f711dd1d438d77f3a75ed9b7b937ab1999882bdb..37ffa17210ad04fe09d310ea57eb1ffc3139218a 100644 (file)
@@ -88,7 +88,7 @@
 #include "BKE_rigidbody.h"
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_tracking.h"
 #include "BKE_mask.h"
 
index 78077084eccd5a45f88a64d2d98e3bc46d6fca6a..43930e3c063acaee2f41d08c9189e466fba9e7c1 100644 (file)
@@ -77,7 +77,7 @@
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_sequencer.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_tracking.h"
 #include "BKE_mask.h"
 
index 889e4f01fc75466bc77373b1bbe5beb21e19fa15..a8f740b7c5a55315527e6cbf6f9a6419ba5cadc6 100644 (file)
@@ -64,7 +64,7 @@
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BIF_gl.h"
 
index 023083a98ffc828ab17763bfb641e8098b3b742a..23dc41283960f5dd35bea3025dfac4a4363528f2 100644 (file)
@@ -47,7 +47,7 @@
 #include "BKE_armature.h"
 #include "BKE_curve.h"
 #include "BKE_context.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_report.h"
 
 #include "BLF_translation.h"
index 0208b3d302ff140566e1d57f530d270819b06e3b..6b3c12d7e508d3623eedaf1fdfb44b3bca0485e9 100644 (file)
@@ -57,7 +57,7 @@
 #include "BKE_object.h"
 #include "BKE_anim.h"  /* for duplis */
 #include "BKE_context.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_mesh.h"
 
 #include "RNA_access.h"
index 7f534493975fd166e7d4d3af3e74313ef0764163..c37d1cc2df46b16837797888eae95af0b931536a 100644 (file)
@@ -45,7 +45,7 @@
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_util.h"
 
index 5c188628978b49fc3b43c8f642117ce87ac02e3e..4b71d1e9267aef510aa824b3342bc649c483a53f 100644 (file)
@@ -49,7 +49,7 @@
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_image.h"
 #include "ED_uvedit.h"
index ba4879b38cadaad12309bd78b9c5faae028735e3..c70d2376cd614a42808becbb5f4452d99ca52088 100644 (file)
@@ -47,7 +47,7 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BLI_array.h"
 #include "BLI_buffer.h"
index 41bc849b2cc77d901c0e226185e39b58c0e334b9..ed8714d473c22a1105b16518a07f72e6f51a4280 100644 (file)
@@ -63,7 +63,7 @@
 #include "BKE_node.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_image.h"
 #include "ED_mesh.h"
index 8f8c5b8e03c37a049dbc3a62e20a6b31d63dd621..44918e9d4955e65bfb7bd0b8b2e1f4309c280add 100644 (file)
@@ -53,7 +53,7 @@
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "ED_mesh.h"
 #include "ED_uvedit.h"
index 14478db3846e5efad8ca7cd6bd68880c720e3cb8..087e8eed0c9c7c0e23ab5e581689222416ce0b3a 100644 (file)
@@ -61,7 +61,7 @@
 #include "BKE_mesh.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
index cfd6a2fd402e0b2a3c2ad1ee6c3b29adb6b54c6d..8a0f73eeddaca27b45e07470d70dbf2daa677264 100644 (file)
@@ -59,7 +59,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_report.h"
 
 #include "ED_mesh.h" /* XXX Bad level call */
index d2bb741057ac6157acb539a0f669fe7fe1470151..7d5bd324647a765ea71c75599d6b7e4d6e5f327b 100644 (file)
@@ -42,7 +42,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_paint.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "BKE_group.h" /* needed for BKE_group_object_exists() */
 
 #include "RNA_access.h"
index b8a42ac6c27c4bad1ce63954da3fb96524f2c8ed..12dbb5142905aead53a21b1b41f8e01769b69948 100644 (file)
@@ -41,7 +41,7 @@
 #include "BLF_translation.h"
 
 #include "BKE_freestyle.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
index 743cd1a829e72ae0cf5903913f8d0dc44a7a49b9..8bec591ab55686aee9312cb6ac7e8a5c8fcf21a3 100644 (file)
@@ -45,7 +45,7 @@
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
index f4d9b7270e6fa55b943d6e845624154246263f49..dda711c28a3e4103a335e7cd0394f4014f925ce2 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "depsgraph_private.h"
 
index 1c22e9bf3646e7904bef3c7ade9ccbb8294cba43..e99b4adfdf69771f9a6cf51db99afa01e7ec45e5 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 static DerivedMesh *triangulate_dm(DerivedMesh *dm, const int flag)
 {
index 47e6baf8e930089bf23e677592462c9d5446285f..99fd3429973525bd5a3b69de463b950608f96da7 100644 (file)
@@ -43,7 +43,7 @@
 #include "bmesh_py_ops.h"
 #include "bmesh_py_utils.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "DNA_mesh_types.h"
 
index e7ca0cd57088ccd9a7fa18285babebb2c27fafc9..cd448d4aaa06fe7df78e98597ab44dda646a67ca 100644 (file)
@@ -3772,7 +3772,7 @@ char *BPy_BMElem_StringFromHType(const char htype)
 
 #include "BKE_global.h"
 #include "BKE_main.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
index 33cb1f5d0fb024b643004a842302e906d632e6d6..5069670a6657053659300c43581ea95ff1114f20 100644 (file)
@@ -43,7 +43,7 @@
 #include "bmesh_py_types.h"
 #include "bmesh_py_types_select.h"
 
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "DNA_mesh_types.h"