From 6da961775f7fd38a5fca40fa9571426dd61c68d8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Apr 2013 20:31:52 +0000 Subject: code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere). --- source/blender/blenkernel/BKE_editmesh.h | 94 +++++++++++++++ source/blender/blenkernel/BKE_tessmesh.h | 94 --------------- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/anim.c | 2 +- source/blender/blenkernel/intern/bvhutils.c | 2 +- source/blender/blenkernel/intern/cdderivedmesh.c | 2 +- source/blender/blenkernel/intern/constraint.c | 2 +- source/blender/blenkernel/intern/editderivedmesh.c | 129 ++++++++++----------- source/blender/blenkernel/intern/key.c | 2 +- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/modifiers_bmesh.c | 2 +- source/blender/blenkernel/intern/multires.c | 2 +- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/shrinkwrap.c | 2 +- source/blender/blenkernel/intern/subsurf_ccg.c | 2 +- source/blender/bmesh/intern/bmesh_mesh.c | 2 +- source/blender/bmesh/tools/BME_bevel.c | 2 +- source/blender/editors/mesh/editface.c | 2 +- source/blender/editors/mesh/editmesh_add.c | 2 +- source/blender/editors/mesh/editmesh_bevel.c | 2 +- source/blender/editors/mesh/editmesh_bvh.c | 2 +- source/blender/editors/mesh/editmesh_extrude.c | 2 +- source/blender/editors/mesh/editmesh_inset.c | 2 +- source/blender/editors/mesh/editmesh_knife.c | 2 +- .../blender/editors/mesh/editmesh_knife_project.c | 2 +- source/blender/editors/mesh/editmesh_loopcut.c | 2 +- source/blender/editors/mesh/editmesh_rip.c | 2 +- source/blender/editors/mesh/editmesh_select.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/mesh/editmesh_utils.c | 2 +- source/blender/editors/mesh/mesh_data.c | 2 +- source/blender/editors/mesh/mesh_navmesh.c | 2 +- source/blender/editors/mesh/meshtools.c | 2 +- source/blender/editors/object/object_edit.c | 2 +- source/blender/editors/object/object_hook.c | 2 +- source/blender/editors/object/object_modifier.c | 2 +- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/object/object_transform.c | 2 +- source/blender/editors/object/object_vgroup.c | 2 +- source/blender/editors/render/render_shading.c | 2 +- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/editors/sculpt_paint/paint_image.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 2 +- source/blender/editors/sculpt_paint/sculpt_uv.c | 2 +- source/blender/editors/space_image/image_edit.c | 2 +- source/blender/editors/space_image/space_image.c | 2 +- source/blender/editors/space_info/info_stats.c | 2 +- source/blender/editors/space_view3d/drawmesh.c | 2 +- source/blender/editors/space_view3d/drawobject.c | 2 +- .../blender/editors/space_view3d/view3d_buttons.c | 2 +- .../blender/editors/space_view3d/view3d_header.c | 2 +- .../blender/editors/space_view3d/view3d_select.c | 2 +- source/blender/editors/space_view3d/view3d_snap.c | 2 +- source/blender/editors/transform/transform.h | 2 +- .../editors/transform/transform_conversions.c | 2 +- .../blender/editors/transform/transform_generics.c | 2 +- .../editors/transform/transform_manipulator.c | 2 +- .../editors/transform/transform_orientations.c | 2 +- source/blender/editors/transform/transform_snap.c | 2 +- source/blender/editors/util/crazyspace.c | 2 +- source/blender/editors/uvedit/uvedit_buttons.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 2 +- .../blender/editors/uvedit/uvedit_smart_stitch.c | 2 +- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 2 +- source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_object.c | 2 +- source/blender/makesrna/intern/rna_scene.c | 2 +- .../blender/modifiers/intern/MOD_laplaciansmooth.c | 2 +- source/blender/modifiers/intern/MOD_meshdeform.c | 2 +- source/blender/modifiers/intern/MOD_triangulate.c | 2 +- source/blender/python/bmesh/bmesh_py_api.c | 2 +- source/blender/python/bmesh/bmesh_py_types.c | 2 +- .../blender/python/bmesh/bmesh_py_types_select.c | 2 +- 75 files changed, 230 insertions(+), 231 deletions(-) create mode 100644 source/blender/blenkernel/BKE_editmesh.h delete mode 100644 source/blender/blenkernel/BKE_tessmesh.h (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h new file mode 100644 index 00000000000..824ecd482e8 --- /dev/null +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -0,0 +1,94 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Joseph Eagar. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __BKE_EDITMESH_H__ +#define __BKE_EDITMESH_H__ + +#include "BKE_customdata.h" +#include "bmesh.h" + +struct BMesh; +struct BMLoop; +struct BMFace; +struct Mesh; +struct DerivedMesh; + +/* ok: the EDBM module is for editmode bmesh stuff. in contrast, the + * BMEdit module is for code shared with blenkernel that concerns + * the BMEditMesh structure. + */ + +/* this structure replaces EditMesh. + * + * through this, you get access to both the edit bmesh, + * it's tessellation, and various stuff that doesn't belong in the BMesh + * struct itself. + * + * the entire derivedmesh and modifier system works with this structure, + * and not BMesh. Mesh->edit_bmesh stores a pointer to this structure. */ +typedef struct BMEditMesh { + struct BMesh *bm; + + /*this is for undoing failed operations*/ + struct BMEditMesh *emcopy; + int emcopyusers; + + /* we store tessellations as triplets of three loops, + * which each define a triangle.*/ + struct BMLoop *(*looptris)[3]; + int tottri; + + /*derivedmesh stuff*/ + struct DerivedMesh *derivedFinal, *derivedCage; + CustomDataMask lastDataMask; + unsigned char (*derivedVertColor)[4]; + int derivedVertColorLen; + + /* index tables, to map indices to elements via + * EDBM_index_arrays_init and associated functions. don't + * touch this or read it directly.*/ + struct BMVert **vert_index; + struct BMEdge **edge_index; + struct BMFace **face_index; + + /*selection mode*/ + short selectmode; + short mat_nr; + + /* Object this editmesh came from (if it came from one) */ + struct Object *ob; + + /* Unused for now, we could bring it back and assign in the same way 'ob' is */ + // struct Mesh *me; + + /*temp variables for x-mirror editing*/ + int mirror_cdlayer; /* -1 is invalid */ +} BMEditMesh; + +void BMEdit_RecalcTessellation(BMEditMesh *em); +BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate); +BMEditMesh *BMEdit_Copy(BMEditMesh *em); +BMEditMesh *BMEdit_FromObject(struct Object *ob); +void BMEdit_Free(BMEditMesh *em); +void BMEdit_UpdateLinkedCustomData(BMEditMesh *em); + +#endif /* __BKE_EDITMESH_H__ */ diff --git a/source/blender/blenkernel/BKE_tessmesh.h b/source/blender/blenkernel/BKE_tessmesh.h deleted file mode 100644 index 7d67425149d..00000000000 --- a/source/blender/blenkernel/BKE_tessmesh.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributor(s): Joseph Eagar. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef __BKE_TESSMESH_H__ -#define __BKE_TESSMESH_H__ - -#include "BKE_customdata.h" -#include "bmesh.h" - -struct BMesh; -struct BMLoop; -struct BMFace; -struct Mesh; -struct DerivedMesh; - -/* ok: the EDBM module is for editmode bmesh stuff. in contrast, the - * BMEdit module is for code shared with blenkernel that concerns - * the BMEditMesh structure. - */ - -/* this structure replaces EditMesh. - * - * through this, you get access to both the edit bmesh, - * it's tessellation, and various stuff that doesn't belong in the BMesh - * struct itself. - * - * the entire derivedmesh and modifier system works with this structure, - * and not BMesh. Mesh->edit_bmesh stores a pointer to this structure. */ -typedef struct BMEditMesh { - struct BMesh *bm; - - /*this is for undoing failed operations*/ - struct BMEditMesh *emcopy; - int emcopyusers; - - /* we store tessellations as triplets of three loops, - * which each define a triangle.*/ - struct BMLoop *(*looptris)[3]; - int tottri; - - /*derivedmesh stuff*/ - struct DerivedMesh *derivedFinal, *derivedCage; - CustomDataMask lastDataMask; - unsigned char (*derivedVertColor)[4]; - int derivedVertColorLen; - - /* index tables, to map indices to elements via - * EDBM_index_arrays_init and associated functions. don't - * touch this or read it directly.*/ - struct BMVert **vert_index; - struct BMEdge **edge_index; - struct BMFace **face_index; - - /*selection mode*/ - short selectmode; - short mat_nr; - - /* Object this editmesh came from (if it came from one) */ - struct Object *ob; - - /* Unused for now, we could bring it back and assign in the same way 'ob' is */ - // struct Mesh *me; - - /*temp variables for x-mirror editing*/ - int mirror_cdlayer; /* -1 is invalid */ -} BMEditMesh; - -void BMEdit_RecalcTessellation(BMEditMesh *em); -BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate); -BMEditMesh *BMEdit_Copy(BMEditMesh *em); -BMEditMesh *BMEdit_FromObject(struct Object *ob); -void BMEdit_Free(BMEditMesh *em); -void BMEdit_UpdateLinkedCustomData(BMEditMesh *em); - -#endif /* __BKE_TESSMESH_H__ */ diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 875f02def13..f78c7045e58 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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 diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 2bef2d7e190..ba0003f82b9 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -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. */ diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 8c49ce22dea..c555b7de5d9 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -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" diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 5028d978351..e44b1f4536e 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -41,7 +41,7 @@ #include "BLI_math.h" #include "BKE_DerivedMesh.h" -#include "BKE_tessmesh.h" +#include "BKE_editmesh.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 0469e6ea787..1a3f5a700b9 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -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" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 12fa16e3273..265cbe13217 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -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" diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index e723ea9e813..f01b550ff7a 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -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)); diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 864c5ef3f92..5c25469facc 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -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" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 39dbd34ccbe..a05f8e2d37c 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -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" diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index a6c2325c740..e2a4130b4d9 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -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. diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 88f534c581c..c1f1ca0bbaa 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -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" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a5f05053bfc..91845178a04 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -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" diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 72db34d339c..10065910532 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -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 diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index ba4a7b20f55..91a992ff92f 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -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" diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 55a22fd3613..f36ac361550 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -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" diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c index 47b507603f4..ba553e2f763 100644 --- a/source/blender/bmesh/tools/BME_bevel.c +++ b/source/blender/bmesh/tools/BME_bevel.c @@ -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" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index c12b2f57f1a..5da2f909d52 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 34666b363f3..be1204e2653 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 3f4c3d3a21c..316aa79af7b 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c index 4c989a22291..f9ef360c3bf 100644 --- a/source/blender/editors/mesh/editmesh_bvh.c +++ b/source/blender/editors/mesh/editmesh_bvh.c @@ -40,7 +40,7 @@ #include "BLI_smallhash.h" #include "BKE_DerivedMesh.h" -#include "BKE_tessmesh.h" +#include "BKE_editmesh.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 694053ae2f7..7eb50117b0f 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index 523f4e11b81..c74cf378756 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 3f1c8ced5d2..063ad46b996 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index 1dae4aa51c8..a5f2e54c2f9 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 62cb1840808..e0f165c77af 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 47e08bd5c7e..aef01c5b462 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index dab5adda790..cb84f9a4eff 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 20b0bf9e647..33c665576c6 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -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" diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 5547df89463..3266bb61c99 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -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 */ diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 97650b3a318..8fbc6c7ae9d 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -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" diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index e6c36274687..6769301373a 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -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" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index b34f43cd082..9e70fe550bc 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -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" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 8b2bf9c8b47..a3f7e0f23d9 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -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" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 43736909c40..f0ab55e1e0f 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -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" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 2239148ca1c..9e49cc64c6c 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -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" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index e242dbfde85..5a688d7daf3 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -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" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 80d494a6a07..f6256174391 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -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" diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 623e23588f0..487a8ad4bc0 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -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" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 7323e434143..c7229115637 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -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" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index e49e7ce53ff..206824d4668 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -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" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index fbc71d90a93..e3adf40a7eb 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -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" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 5fc0cc454e2..14330229aba 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -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" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 5f1a86fe70c..c8bd31d0c2a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -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" diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 34207e16f1c..45acf25a388 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -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" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 815610ff1df..dc2f764d8fd 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -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" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index b2e9427c799..9ec05159627 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -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" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index b13f395b80b..f1111abf860 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -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" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 9f24db3c9a3..bb2a18ed6c2 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -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" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index a439b5b5b87..76a32a20c1c 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -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" diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 854bd9f6cf8..b7ebee49c48 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -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" diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 209bb76df91..a2529332f93 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -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" diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index eb32baf4c3f..39d00badfaf 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -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" diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 00289f95375..1440be9ff85 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -40,7 +40,7 @@ #include "DNA_listBase.h" #include "BLI_smallhash.h" -#include "BKE_tessmesh.h" +#include "BKE_editmesh.h" /* ************************** Types ***************************** */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index f711dd1d438..37ffa17210a 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -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" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 78077084ecc..43930e3c063 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -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" diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 889e4f01fc7..a8f740b7c5a 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -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" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 023083a98ff..23dc4128396 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -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" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 0208b3d302f..6b3c12d7e50 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -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" diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index 7f534493975..c37d1cc2df4 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -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" diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 5c188628978..4b71d1e9267 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -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" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index ba4879b38ca..c70d2376cd6 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -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" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 41bc849b2cc..ed8714d473c 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -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" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 8f8c5b8e03c..44918e9d495 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -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" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 14478db3846..087e8eed0c9 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -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" diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index cfd6a2fd402..8a0f73eedda 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -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 */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index d2bb741057a..7d5bd324647 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -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" diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b8a42ac6c27..12dbb514290 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 743cd1a829e..8bec591ab55 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -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" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index f4d9b7270e6..dda711c28a3 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -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" diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 1c22e9bf364..e99b4adfdf6 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -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) { diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index 47e6baf8e93..99fd3429973 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -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" diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index e7ca0cd5708..cd448d4aaa0 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -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" diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index 33cb1f5d0fb..5069670a665 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -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" -- cgit v1.2.3