From 37e73aa368d7f3cd855fab0812673b484ee4f4e9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2013 05:59:48 +0000 Subject: code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h --- source/blender/blenkernel/BKE_editmesh.h | 13 ++- source/blender/blenkernel/BKE_editmesh_bvh.h | 21 ++--- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/anim.c | 4 +- source/blender/blenkernel/intern/constraint.c | 2 +- source/blender/blenkernel/intern/editderivedmesh.c | 19 ----- source/blender/blenkernel/intern/editmesh.c | 46 ++++++++--- source/blender/blenkernel/intern/editmesh_bvh.c | 14 ++-- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/modifiers_bmesh.c | 4 +- source/blender/blenkernel/intern/object.c | 4 +- source/blender/bmesh/intern/bmesh_mesh.c | 6 +- source/blender/editors/mesh/editmesh_add.c | 20 ++--- source/blender/editors/mesh/editmesh_bevel.c | 2 +- source/blender/editors/mesh/editmesh_extrude.c | 14 ++-- source/blender/editors/mesh/editmesh_inset.c | 2 +- source/blender/editors/mesh/editmesh_knife.c | 14 ++-- .../blender/editors/mesh/editmesh_knife_project.c | 2 +- source/blender/editors/mesh/editmesh_loopcut.c | 2 +- source/blender/editors/mesh/editmesh_rip.c | 6 +- source/blender/editors/mesh/editmesh_select.c | 58 ++++++------- source/blender/editors/mesh/editmesh_tools.c | 94 +++++++++++----------- source/blender/editors/mesh/editmesh_utils.c | 40 ++++----- source/blender/editors/mesh/mesh_data.c | 2 +- source/blender/editors/mesh/mesh_navmesh.c | 6 +- source/blender/editors/mesh/mesh_ops.c | 2 +- source/blender/editors/object/object_edit.c | 4 +- source/blender/editors/object/object_hook.c | 2 +- source/blender/editors/object/object_modifier.c | 6 +- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/object/object_vgroup.c | 8 +- source/blender/editors/render/render_shading.c | 4 +- source/blender/editors/screen/screen_ops.c | 4 +- source/blender/editors/sculpt_paint/sculpt_uv.c | 6 +- source/blender/editors/space_image/image_edit.c | 4 +- source/blender/editors/space_info/info_stats.c | 2 +- .../blender/editors/space_view3d/view3d_header.c | 2 +- .../blender/editors/space_view3d/view3d_select.c | 6 +- source/blender/editors/space_view3d/view3d_snap.c | 6 +- source/blender/editors/transform/transform.c | 14 ++-- .../editors/transform/transform_conversions.c | 8 +- .../blender/editors/transform/transform_generics.c | 6 +- .../editors/transform/transform_manipulator.c | 2 +- source/blender/editors/transform/transform_ops.c | 2 +- .../editors/transform/transform_orientations.c | 2 +- source/blender/editors/transform/transform_snap.c | 6 +- source/blender/editors/uvedit/uvedit_buttons.c | 4 +- source/blender/editors/uvedit/uvedit_draw.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 48 +++++------ .../blender/editors/uvedit/uvedit_smart_stitch.c | 2 +- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 26 +++--- source/blender/makesdna/DNA_mesh_types.h | 2 +- source/blender/makesrna/intern/rna_object.c | 2 +- 53 files changed, 290 insertions(+), 293 deletions(-) diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 824ecd482e8..934689424fa 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -30,7 +30,6 @@ 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 @@ -84,11 +83,11 @@ typedef struct BMEditMesh { 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); +void BKE_editmesh_tessface_calc(BMEditMesh *em); +BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate); +BMEditMesh *BKE_editmesh_copy(BMEditMesh *em); +BMEditMesh *BKE_editmesh_from_object(struct Object *ob); +void BKE_editmesh_free(BMEditMesh *em); +void BKE_editmesh_update_linked_customdata(BMEditMesh *em); #endif /* __BKE_EDITMESH_H__ */ diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h index edf261da6e8..cdab48f239c 100644 --- a/source/blender/blenkernel/BKE_editmesh_bvh.h +++ b/source/blender/blenkernel/BKE_editmesh_bvh.h @@ -34,27 +34,22 @@ struct BMEditMesh; struct BMFace; -struct BMEdge; struct BMVert; -struct RegionView3D; struct BMBVHTree; struct BVHTree; struct Scene; -struct Object; typedef struct BMBVHTree BMBVHTree; -BMBVHTree *BMBVH_NewBVH(struct BMEditMesh *em, int flag, struct Scene *scene); -void BMBVH_FreeBVH(BMBVHTree *tree); -struct BVHTree *BMBVH_BVHTree(BMBVHTree *tree); +BMBVHTree *BKE_bmbvh_new(struct BMEditMesh *em, int flag, struct Scene *scene); +void BKE_bmbvh_free(BMBVHTree *tree); +struct BVHTree *BKE_bmbvh_tree_get(BMBVHTree *tree); +struct BMFace *BKE_bmbvh_ray_cast(BMBVHTree *tree, const float co[3], const float dir[3], + float r_hitout[3], float r_cagehit[3]); +/* find a vert closest to co in a sphere of radius maxdist */ +struct BMVert *BKE_bmbvh_find_vert_closest(BMBVHTree *tree, const float co[3], const float maxdist); -struct BMFace *BMBVH_RayCast(BMBVHTree *tree, const float co[3], const float dir[3], - float r_hitout[3], float r_cagehit[3]); - -/*find a vert closest to co in a sphere of radius maxdist*/ -struct BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], const float maxdist); - -/* BMBVH_NewBVH flag parameter */ +/* BKE_bmbvh_new flag parameter */ enum { BMBVH_USE_CAGE = 1, /* project geometry onto modifier cage */ BMBVH_RETURN_ORIG = 2, /* use with BMBVH_USE_CAGE, returns hits in relation to original geometry */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 8333fc4ab26..d1a1163d5c7 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1198,7 +1198,7 @@ static void calc_colors_from_weights_array(const int num, const float *weights, void DM_update_weight_mcol(Object *ob, DerivedMesh *dm, int const draw_flag, float *weights, int num, const int *indices) { - BMEditMesh *em = (dm->type == DM_TYPE_EDITBMESH) ? BMEdit_FromObject(ob) : NULL; + BMEditMesh *em = (dm->type == DM_TYPE_EDITBMESH) ? BKE_editmesh_from_object(ob) : NULL; unsigned char (*wtcol_v)[4]; int numVerts = dm->getNumVerts(dm); int i; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 1f54da402ab..3494f68984c 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -964,7 +964,7 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl /* simple preventing of too deep nested groups */ if (level > MAX_DUPLI_RECUR) return; - em = BMEdit_FromObject(par); + em = BKE_editmesh_from_object(par); /* get derived mesh */ dm_mask = CD_MASK_BAREMESH; @@ -1091,7 +1091,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa if (level > MAX_DUPLI_RECUR) return; copy_m4_m4(pmat, par->obmat); - em = BMEdit_FromObject(par); + em = BKE_editmesh_from_object(par); /* get derived mesh */ dm_mask = CD_MASK_BAREMESH; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 265cbe13217..af5a20e97b4 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -350,7 +350,7 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[4][4]) { DerivedMesh *dm = NULL; - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); float vec[3] = {0.0f, 0.0f, 0.0f}; float normal[3] = {0.0f, 0.0f, 0.0f}, plane[3]; float imat[3][3], tmat[3][3]; diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 706f817039d..447dd88a0a6 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -49,7 +49,6 @@ #include "BKE_mesh.h" #include "BKE_editmesh.h" - #include "DNA_mesh_types.h" #include "DNA_object_types.h" @@ -1531,21 +1530,3 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, return (DerivedMesh *)bmdm; } - -/** - * \brief Return the BMEditMesh for a given object - * - * \note this function assumes this is a mesh object, - * don't add NULL data check here. caller must do that - */ -BMEditMesh *BMEdit_FromObject(Object *ob) -{ - BLI_assert(ob->type == OB_MESH); - /* sanity check */ -#ifndef NDEBUG - if (((Mesh *)ob->data)->edit_btmesh) { - BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob); - } -#endif - return ((Mesh *)ob->data)->edit_btmesh; -} diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index c82bc409c78..2782cecfd8d 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -29,29 +29,32 @@ * \ingroup bke */ -#include "BLI_math.h" +#include "MEM_guardedalloc.h" -#include "BKE_cdderivedmesh.h" +#include "DNA_listBase.h" +#include "DNA_object_types.h" +#include "DNA_mesh_types.h" -#include "MEM_guardedalloc.h" +#include "BLI_math.h" +#include "BLI_scanfill.h" #include "BKE_editmesh.h" -#include "BLI_scanfill.h" +#include "BKE_cdderivedmesh.h" -BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate) +BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate) { BMEditMesh *em = MEM_callocN(sizeof(BMEditMesh), __func__); em->bm = bm; if (do_tessellate) { - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } return em; } -BMEditMesh *BMEdit_Copy(BMEditMesh *em) +BMEditMesh *BKE_editmesh_copy(BMEditMesh *em) { BMEditMesh *em_copy = MEM_callocN(sizeof(BMEditMesh), __func__); *em_copy = *em; @@ -77,7 +80,26 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *em) return em_copy; } -static void BMEdit_RecalcTessellation_intern(BMEditMesh *em) +/** + * \brief Return the BMEditMesh for a given object + * + * \note this function assumes this is a mesh object, + * don't add NULL data check here. caller must do that + */ +BMEditMesh *BKE_editmesh_from_object(Object *ob) +{ + BLI_assert(ob->type == OB_MESH); + /* sanity check */ +#ifndef NDEBUG + if (((Mesh *)ob->data)->edit_btmesh) { + BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob); + } +#endif + return ((Mesh *)ob->data)->edit_btmesh; +} + + +static void editmesh_tessface_calc_intern(BMEditMesh *em) { /* use this to avoid locking pthread for _every_ polygon * and calling the fill function */ @@ -249,9 +271,9 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *em) } -void BMEdit_RecalcTessellation(BMEditMesh *em) +void BKE_editmesh_tessface_calc(BMEditMesh *em) { - BMEdit_RecalcTessellation_intern(em); + editmesh_tessface_calc_intern(em); /* commented because editbmesh_build_data() ensures we get tessfaces */ #if 0 @@ -268,7 +290,7 @@ void BMEdit_RecalcTessellation(BMEditMesh *em) #endif } -void BMEdit_UpdateLinkedCustomData(BMEditMesh *em) +void BKE_editmesh_update_linked_customdata(BMEditMesh *em) { BMesh *bm = em->bm; int act; @@ -289,7 +311,7 @@ void BMEdit_UpdateLinkedCustomData(BMEditMesh *em) } /*does not free the BMEditMesh struct itself*/ -void BMEdit_Free(BMEditMesh *em) +void BKE_editmesh_free(BMEditMesh *em) { if (em->derivedFinal) { if (em->derivedFinal != em->derivedCage) { diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index 2d8249551fc..8a00887d26a 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -75,7 +75,7 @@ static void cage_mapped_verts_callback(void *userData, int index, const float co } } -BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, struct Scene *scene) +BMBVHTree *BKE_bmbvh_new(BMEditMesh *em, int flag, struct Scene *scene) { BMBVHTree *tree = MEM_callocN(sizeof(*tree), "BMBVHTree"); DerivedMesh *cage, *final; @@ -88,7 +88,7 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, struct Scene *scene) * so that e.g. mirror or array use original vertex coordinates and not mirrored or duplicate */ BLI_smallhash_init(&shash); - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); tree->ob = em->ob; tree->scene = scene; @@ -180,7 +180,7 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, struct Scene *scene) return tree; } -void BMBVH_FreeBVH(BMBVHTree *tree) +void BKE_bmbvh_free(BMBVHTree *tree) { BLI_bvhtree_free(tree->tree); @@ -232,8 +232,8 @@ static void raycallback(void *userdata, int index, const BVHTreeRay *ray, BVHTre } } -BMFace *BMBVH_RayCast(BMBVHTree *tree, const float co[3], const float dir[3], - float r_hitout[3], float r_cagehit[3]) +BMFace *BKE_bmbvh_ray_cast(BMBVHTree *tree, const float co[3], const float dir[3], + float r_hitout[3], float r_cagehit[3]) { BVHTreeRayHit hit; @@ -273,7 +273,7 @@ BMFace *BMBVH_RayCast(BMBVHTree *tree, const float co[3], const float dir[3], return NULL; } -BVHTree *BMBVH_BVHTree(BMBVHTree *tree) +BVHTree *BKE_bmbvh_tree_get(BMBVHTree *tree) { return tree->tree; } @@ -300,7 +300,7 @@ static void vertsearchcallback(void *userdata, int index, const float *UNUSED(co } } -BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], const float maxdist) +BMVert *BKE_bmbvh_find_vert_closest(BMBVHTree *tree, const float co[3], const float maxdist) { BVHTreeNearest hit; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index a05f8e2d37c..31c2758795d 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -351,7 +351,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) static void mesh_update_linked_customdata(Mesh *me, const bool do_ensure_tess_cd) { if (me->edit_btmesh) - BMEdit_UpdateLinkedCustomData(me->edit_btmesh); + BKE_editmesh_update_linked_customdata(me->edit_btmesh); if (do_ensure_tess_cd) { mesh_ensure_tessellation_customdata(me); diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index e2a4130b4d9..765e65361a8 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -217,11 +217,11 @@ BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tessel DM_to_bmesh_ex(dm, bm); if (!em) { - em = BMEdit_Create(bm, do_tessellate); + em = BKE_editmesh_create(bm, do_tessellate); } else { if (do_tessellate) { - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 91845178a04..538cead5d5b 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2716,7 +2716,7 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob, case OB_MESH: { #if 0 // XXX, comment for 2.56a release, background wont set 'scene->customdata_mask' - BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(ob) : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BKE_editmesh_from_object(ob) : NULL; BLI_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH); if (em) { makeDerivedMesh(scene, ob, em, scene->customdata_mask, 0); /* was CD_MASK_BAREMESH */ @@ -2726,7 +2726,7 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob, } #else /* ensure CD_MASK_BAREMESH for now */ - BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(ob) : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BKE_editmesh_from_object(ob) : NULL; uint64_t data_mask = scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH; if (em) { makeDerivedMesh(scene, ob, em, data_mask, 0); /* was CD_MASK_BAREMESH */ diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 2c16bb3a9fe..2f97f15515b 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -355,7 +355,7 @@ static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from { /* switch multires data out of tangent space */ if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) { - BMEditMesh *em = BMEdit_Create(bm, false); + BMEditMesh *em = BKE_editmesh_create(bm, false); DerivedMesh *dm = CDDM_from_editbmesh(em, true, false); MDisps *mdisps; BMFace *f; @@ -396,9 +396,9 @@ static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from dm->needsFree = 1; dm->release(dm); - /* setting this to NULL prevents BMEdit_Free from freeing it */ + /* setting this to NULL prevents BKE_editmesh_free from freeing it */ em->bm = NULL; - BMEdit_Free(em); + BKE_editmesh_free(em); MEM_freeN(em); } } diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index b7a815c3219..2fb1f43a237 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -78,7 +78,7 @@ static Object *make_prim_init(bContext *C, const char *idname, static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode, int enter_editmode) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int exit_editmode = ((was_editmode == true) && (enter_editmode == false)); /* Primitive has all verts selected, use vert select flush @@ -106,7 +106,7 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_grid x_segments=%i y_segments=%i size=%f matrix=%m4", 1, 1, dia, mat)) @@ -147,7 +147,7 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_cube matrix=%m4 size=%f", mat, dia * 2.0f)) { return OPERATOR_CANCELLED; @@ -197,7 +197,7 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_circle segments=%i diameter=%f cap_ends=%b cap_tris=%b matrix=%m4", @@ -252,7 +252,7 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf( em, op, "verts.out", @@ -313,7 +313,7 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf( em, op, "verts.out", @@ -370,7 +370,7 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_grid x_segments=%i y_segments=%i size=%f matrix=%m4", @@ -431,7 +431,7 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op) mat[1][1] *= dia; mat[2][2] *= dia; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_monkey matrix=%m4", mat)) { return OPERATOR_CANCELLED; @@ -470,7 +470,7 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4", @@ -522,7 +522,7 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op) ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL); obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!EDBM_op_call_and_selectf( em, op, "verts.out", diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 316aa79af7b..ed55383e8a4 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -94,7 +94,7 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C) static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BevelData *opdata; if (em->bm->totvertsel == 0) { diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 7eb50117b0f..a83a65f2487 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -266,7 +266,7 @@ static short edbm_extrude_vert(Object *obedit, BMEditMesh *em, const char hflag, static int edbm_extrude_repeat_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); RegionView3D *rv3d = CTX_wm_region_view3d(C); const int steps = RNA_int_get(op->ptr, "steps"); @@ -409,7 +409,7 @@ static int edbm_extrude_region_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); edbm_extrude_mesh(scene, obedit, em, op, NULL); @@ -444,7 +444,7 @@ void MESH_OT_extrude_region(wmOperatorType *ot) static int edbm_extrude_verts_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); float nor[3]; edbm_extrude_verts_indiv(em, op, BM_ELEM_SELECT, nor); @@ -475,7 +475,7 @@ void MESH_OT_extrude_verts_indiv(wmOperatorType *ot) static int edbm_extrude_edges_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); float nor[3]; edbm_extrude_edges_indiv(em, op, BM_ELEM_SELECT, nor); @@ -506,7 +506,7 @@ void MESH_OT_extrude_edges_indiv(wmOperatorType *ot) static int edbm_extrude_faces_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); float nor[3]; edbm_extrude_discrete_faces(em, op, BM_ELEM_SELECT, nor); @@ -718,7 +718,7 @@ void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot) static int edbm_spin_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMOperator spinop; float cent[3], axis[3], imat[3][3]; @@ -802,7 +802,7 @@ void MESH_OT_spin(wmOperatorType *ot) static int edbm_screw_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMEdge *eed; BMVert *eve, *v1, *v2; diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index c74cf378756..43c197a7b26 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -111,7 +111,7 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal) { InsetData *opdata; Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (em->bm->totvertsel == 0) { return false; diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 62c85078995..27a0d11314c 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1176,7 +1176,7 @@ static BMEdgeHit *knife_edge_tri_isect(KnifeTool_OpData *kcd, BMBVHTree *bmtree, const float v1[3], const float v2[3], const float v3[3], SmallHash *ehash, bglMats *mats, int *count) { - BVHTree *tree2 = BLI_bvhtree_new(3, FLT_EPSILON * 4, 8, 8), *tree = BMBVH_BVHTree(bmtree); + BVHTree *tree2 = BLI_bvhtree_new(3, FLT_EPSILON * 4, 8, 8), *tree = BKE_bmbvh_tree_get(bmtree); BMEdgeHit *edges = NULL; BLI_array_declare(edges); BVHTreeOverlap *results, *result; @@ -1268,7 +1268,7 @@ static BMEdgeHit *knife_edge_tri_isect(KnifeTool_OpData *kcd, BMBVHTree *bmtree, add_v3_v3(p1, no); /* ray cast */ - f_hit = BMBVH_RayCast(bmtree, p1, no, NULL, NULL); + f_hit = BKE_bmbvh_ray_cast(bmtree, p1, no, NULL, NULL); } /* ok, if visible add the new point */ @@ -1502,7 +1502,7 @@ static BMFace *knife_find_closest_face(KnifeTool_OpData *kcd, float co[3], float knife_input_ray_segment(kcd, kcd->curr.mval, 1.0f, origin, origin_ofs); sub_v3_v3v3(ray, origin_ofs, origin); - f = BMBVH_RayCast(kcd->bmbvh, origin, ray, co, cageco); + f = BKE_bmbvh_ray_cast(kcd->bmbvh, origin, ray, co, cageco); if (is_space) *is_space = !f; @@ -2932,7 +2932,7 @@ static void knifetool_exit_ex(bContext *C, KnifeTool_OpData *kcd) BLI_ghash_free(kcd->origvertmap, NULL, NULL); BLI_ghash_free(kcd->kedgefacemap, NULL, NULL); - BMBVH_FreeBVH(kcd->bmbvh); + BKE_bmbvh_free(kcd->bmbvh); BLI_memarena_free(kcd->arena); /* tag for redraw */ @@ -3000,7 +3000,7 @@ static void knifetool_init(bContext *C, KnifeTool_OpData *kcd, em_setup_viewcontext(C, &kcd->vc); - kcd->em = BMEdit_FromObject(kcd->ob); + kcd->em = BKE_editmesh_from_object(kcd->ob); BM_mesh_elem_index_ensure(kcd->em->bm, BM_VERT); @@ -3014,7 +3014,7 @@ static void knifetool_init(bContext *C, KnifeTool_OpData *kcd, cage->foreachMappedVert(cage, cage_mapped_verts_callback, data); BLI_smallhash_release(&shash); - kcd->bmbvh = BMBVH_NewBVH(kcd->em, + kcd->bmbvh = BKE_bmbvh_new(kcd->em, (BMBVH_USE_CAGE | BMBVH_RETURN_ORIG) | (only_select ? BMBVH_RESPECT_SELECT : BMBVH_RESPECT_HIDDEN), scene); @@ -3157,7 +3157,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event) KnifeTool_OpData *kcd = op->customdata; bool do_refresh = false; - if (!obedit || obedit->type != OB_MESH || BMEdit_FromObject(obedit) != kcd->em) { + if (!obedit || obedit->type != OB_MESH || BKE_editmesh_from_object(obedit) != kcd->em) { knifetool_exit(C, op); ED_area_headerprint(CTX_wm_area(C), NULL); return OPERATOR_FINISHED; diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index a5f2e54c2f9..8d385a7e6ff 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -116,7 +116,7 @@ static int knifeproject_exec(bContext *C, wmOperator *op) ARegion *ar = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); LinkNode *polys = NULL; diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index e0f165c77af..1bd6f285706 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -354,7 +354,7 @@ static int ringsel_init(bContext *C, wmOperator *op, bool do_cut) lcd->ar = CTX_wm_region(C); lcd->draw_handle = ED_region_draw_cb_activate(lcd->ar->type, ringsel_draw, lcd, REGION_DRAW_POST_VIEW); lcd->ob = CTX_data_edit_object(C); - lcd->em = BMEdit_FromObject(lcd->ob); + lcd->em = BKE_editmesh_from_object(lcd->ob); lcd->extend = do_cut ? 0 : RNA_boolean_get(op->ptr, "extend"); lcd->do_cut = do_cut; diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index aef01c5b462..b4c31b2df91 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -538,7 +538,7 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve Object *obedit = CTX_data_edit_object(C); ARegion *ar = CTX_wm_region(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMIter iter, liter; BMLoop *l; @@ -860,7 +860,7 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *eve Object *obedit = CTX_data_edit_object(C); ARegion *ar = CTX_wm_region(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMIter iter, eiter; BMLoop *l; @@ -984,7 +984,7 @@ static int edbm_rip_invoke__edge(bContext *C, wmOperator *op, const wmEvent *eve static int edbm_rip_invoke(bContext *C, wmOperator *op, const wmEvent *event) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMIter iter; BMEdge *e; diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 8d3086c66a3..3e4ba77c677 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -114,7 +114,7 @@ void EDBM_automerge(Scene *scene, Object *obedit, bool update) (obedit && obedit->type == OB_MESH)) { int ok; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!em) { return; @@ -714,7 +714,7 @@ static EnumPropertyItem prop_similar_types[] = { static int similar_face_select_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* get the type from RNA */ @@ -754,7 +754,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) static int similar_edge_select_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* get the type from RNA */ @@ -798,7 +798,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) static int similar_vert_select_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* get the type from RNA */ const int type = RNA_enum_get(op->ptr, "type"); @@ -863,7 +863,7 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS if (obedit && obedit->type == OB_MESH) { EnumPropertyItem *item = NULL; int a, totitem = 0; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (em->selectmode & SCE_SELECT_VERTEX) { for (a = SIMVERT_NORMAL; a < SIMEDGE_LENGTH; a++) { @@ -1019,7 +1019,7 @@ static void walker_select(BMEditMesh *em, int walkercode, void *start, const boo static int edbm_loop_multiselect_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEdge *eed; BMEdge **edarray; int edindex; @@ -1269,7 +1269,7 @@ void MESH_OT_edgering_select(wmOperatorType *ot) static int edbm_select_all_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int action = RNA_enum_get(op->ptr, "action"); switch (action) { @@ -1313,7 +1313,7 @@ void MESH_OT_select_all(wmOperatorType *ot) static int edbm_faces_select_interior_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (EDBM_select_interior_faces(em)) { WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit); @@ -1873,7 +1873,7 @@ static int edbm_shortest_path_select_poll(bContext *C) { if (ED_operator_editmesh_region_view3d(C)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); return (em->selectmode & (SCE_SELECT_EDGE | SCE_SELECT_FACE)) != 0; } return 0; @@ -2176,7 +2176,7 @@ bool EDBM_selectmode_toggle(bContext *C, const short selectmode_new, bool ret = false; if (obedit && obedit->type == OB_MESH) { - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); } if (em == NULL) { @@ -2386,7 +2386,7 @@ static void linked_limit_default(bContext *C, wmOperator *op) { if (!RNA_struct_property_is_set(op->ptr, "limit")) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (em->selectmode == SCE_SELECT_FACE) RNA_boolean_set(op->ptr, "limit", true); else @@ -2397,7 +2397,7 @@ static void linked_limit_default(bContext *C, wmOperator *op) static int edbm_select_linked_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMIter iter; BMVert *v; @@ -2611,7 +2611,7 @@ void MESH_OT_select_linked_pick(wmOperatorType *ot) static int edbm_select_face_by_sides_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMIter iter; const int numverts = RNA_int_get(op->ptr, "number"); @@ -2686,7 +2686,7 @@ void MESH_OT_select_face_by_sides(wmOperatorType *ot) static int edbm_select_loose_verts_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMVert *eve; BMEdge *eed; BMIter iter; @@ -2734,7 +2734,7 @@ void MESH_OT_select_loose_verts(wmOperatorType *ot) static int edbm_select_mirror_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); bool extend = RNA_boolean_get(op->ptr, "extend"); if (em->bm->totvert && em->bm->totvertsel) { @@ -2769,7 +2769,7 @@ void MESH_OT_select_mirror(wmOperatorType *ot) static int edbm_select_more_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); EDBM_select_more(em); @@ -2795,7 +2795,7 @@ void MESH_OT_select_more(wmOperatorType *ot) static int edbm_select_less_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); EDBM_select_less(em); @@ -2980,7 +2980,7 @@ static bool edbm_deselect_nth(BMEditMesh *em, int nth, int offset) static int edbm_select_nth_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int nth = RNA_int_get(op->ptr, "nth"); int offset = RNA_int_get(op->ptr, "offset"); @@ -3021,7 +3021,7 @@ void em_setup_viewcontext(bContext *C, ViewContext *vc) view3d_set_viewcontext(C, vc); if (vc->obedit) { - vc->em = BMEdit_FromObject(vc->obedit); + vc->em = BKE_editmesh_from_object(vc->obedit); } } @@ -3033,7 +3033,7 @@ static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op) * small enough, select the edge */ Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMIter iter; BMEdge *e; BMLoop *l1, *l2; @@ -3082,7 +3082,7 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot) static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMIter iter, liter, liter2; BMFace *f, **stack = NULL; BLI_array_declare(stack); @@ -3165,7 +3165,7 @@ void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMVert *v; BMEdge *e; BMIter iter; @@ -3220,7 +3220,7 @@ void MESH_OT_select_non_manifold(wmOperatorType *ot) static int edbm_select_random_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMVert *eve; BMEdge *eed; BMFace *efa; @@ -3283,7 +3283,7 @@ void MESH_OT_select_random(wmOperatorType *ot) static int edbm_select_ungrouped_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMVert *eve; BMIter iter; @@ -3338,7 +3338,7 @@ void MESH_OT_select_ungrouped(wmOperatorType *ot) static int edbm_select_axis_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEditSelection *ese = em->bm->selected.last; const int axis = RNA_enum_get(op->ptr, "axis"); const int mode = RNA_enum_get(op->ptr, "mode"); /* -1 == aligned, 0 == neg, 1 == pos */ @@ -3421,7 +3421,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *f; BMVert *v; BMIter iter; @@ -3471,7 +3471,7 @@ void MESH_OT_select_next_loop(wmOperatorType *ot) static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *f; BMEdge *e; BMIter iter; @@ -3672,7 +3672,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) static int edbm_loop_to_region_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMIter iter; BMFace *f; const bool select_bigger = RNA_boolean_get(op->ptr, "select_bigger"); @@ -3733,7 +3733,7 @@ typedef struct PathEdge { static int edbm_select_vertex_path_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; BMIter iter; BMVert *eve = NULL, *svert = NULL, *evert = NULL; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index d43120f998e..58edade4efa 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -77,7 +77,7 @@ static int edbm_subdivide_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int cuts = RNA_int_get(op->ptr, "number_cuts"); float smooth = 0.292f * RNA_float_get(op->ptr, "smoothness"); const float fractal = RNA_float_get(op->ptr, "fractal") / 2.5f; @@ -146,7 +146,7 @@ void MESH_OT_subdivide(wmOperatorType *ot) static int edbm_unsubdivide_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; const int iterations = RNA_int_get(op->ptr, "iterations"); @@ -223,7 +223,7 @@ static EnumPropertyItem prop_mesh_delete_types[] = { static int edbm_delete_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int type = RNA_enum_get(op->ptr, "type"); if (type == 0) { @@ -281,7 +281,7 @@ void MESH_OT_delete(wmOperatorType *ot) static int edbm_collapse_edge_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!EDBM_op_callf(em, op, "collapse edges=%he", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; @@ -309,7 +309,7 @@ void MESH_OT_edge_collapse(wmOperatorType *ot) static int edbm_collapse_edge_loop_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!EDBM_op_callf(em, op, "dissolve_edge_loop edges=%he", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; @@ -488,7 +488,7 @@ static int edbm_add_edge_face_exec(bContext *C, wmOperator *op) { BMOperator bmop; Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const short use_smooth = edbm_add_edge_face__smooth_get(em->bm); const int totedge_orig = em->bm->totedge; const int totface_orig = em->bm->totface; @@ -567,7 +567,7 @@ static int edbm_mark_seam(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); Mesh *me = ((Mesh *)obedit->data); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMEdge *eed; BMIter iter; @@ -621,7 +621,7 @@ static int edbm_mark_sharp(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); Mesh *me = ((Mesh *)obedit->data); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMEdge *eed; BMIter iter; @@ -675,7 +675,7 @@ void MESH_OT_mark_sharp(wmOperatorType *ot) static int edbm_vert_connect(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMOperator bmop; int len = 0; @@ -715,7 +715,7 @@ void MESH_OT_vert_connect(wmOperatorType *ot) static int edbm_edge_split_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMOperator bmop; int len = 0; @@ -754,7 +754,7 @@ void MESH_OT_edge_split(wmOperatorType *ot) static int edbm_duplicate_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; EDBM_op_init(em, &bmop, op, "duplicate geom=%hvef", BM_ELEM_SELECT); @@ -802,7 +802,7 @@ void MESH_OT_duplicate(wmOperatorType *ot) static int edbm_flip_normals_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!EDBM_op_callf(em, op, "reverse_faces faces=%hf", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; @@ -837,7 +837,7 @@ static const EnumPropertyItem direction_items[] = { static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; BMEdge *eed; BMIter iter; @@ -915,7 +915,7 @@ void MESH_OT_edge_rotate(wmOperatorType *ot) static int edbm_hide_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); EDBM_mesh_hide(em, RNA_boolean_get(op->ptr, "unselected")); @@ -945,7 +945,7 @@ void MESH_OT_hide(wmOperatorType *ot) static int edbm_reveal_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); EDBM_mesh_reveal(em); @@ -972,7 +972,7 @@ void MESH_OT_reveal(wmOperatorType *ot) static int edbm_normals_make_consistent_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); /* doflip has to do with bmesh_rationalize_normals, it's an internal * thing */ @@ -1009,7 +1009,7 @@ void MESH_OT_normals_make_consistent(wmOperatorType *ot) static int edbm_do_smooth_vertex_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ModifierData *md; int mirrx = false, mirry = false, mirrz = false; int i, repeat; @@ -1092,7 +1092,7 @@ void MESH_OT_vertices_smooth(wmOperatorType *ot) static int edbm_do_smooth_laplacian_vertex_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); int usex = true, usey = true, usez = true, preserve_volume = true; int i, repeat; float lambda_factor; @@ -1190,7 +1190,7 @@ static void mesh_set_smooth_faces(BMEditMesh *em, short smooth) static int edbm_faces_shade_smooth_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); mesh_set_smooth_faces(em, 1); @@ -1217,7 +1217,7 @@ void MESH_OT_faces_shade_smooth(wmOperatorType *ot) static int edbm_faces_shade_flat_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); mesh_set_smooth_faces(em, 0); @@ -1247,7 +1247,7 @@ void MESH_OT_faces_shade_flat(wmOperatorType *ot) static int edbm_rotate_uvs_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* get the direction from RNA */ @@ -1272,7 +1272,7 @@ static int edbm_rotate_uvs_exec(bContext *C, wmOperator *op) static int edbm_reverse_uvs_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */ @@ -1294,7 +1294,7 @@ static int edbm_reverse_uvs_exec(bContext *C, wmOperator *op) static int edbm_rotate_colors_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* get the direction from RNA */ @@ -1321,7 +1321,7 @@ static int edbm_rotate_colors_exec(bContext *C, wmOperator *op) static int edbm_reverse_colors_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; /* initialize the bmop using EDBM api, which does various ui error reporting and other stuff */ @@ -1503,7 +1503,7 @@ static int edbm_merge_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); View3D *v3d = CTX_wm_view3d(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int type = RNA_enum_get(op->ptr, "type"); const bool uvs = RNA_boolean_get(op->ptr, "uvs"); bool ok = false; @@ -1559,7 +1559,7 @@ static EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), obedit = CTX_data_edit_object(C); if (obedit && obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (em->selectmode & SCE_SELECT_VERTEX) { if (em->bm->selected.first && em->bm->selected.last && @@ -1615,7 +1615,7 @@ void MESH_OT_merge(wmOperatorType *ot) static int edbm_remove_doubles_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; const float threshold = RNA_float_get(op->ptr, "threshold"); const bool use_unselected = RNA_boolean_get(op->ptr, "use_unselected"); @@ -1805,7 +1805,7 @@ static EnumPropertyItem *shape_itemf(bContext *C, PointerRNA *UNUSED(ptr), Prop int totitem = 0; if ((obedit && obedit->type == OB_MESH) && - (em = BMEdit_FromObject(obedit)) && + (em = BKE_editmesh_from_object(obedit)) && CustomData_has_layer(&em->bm->vdata, CD_SHAPEKEY)) { EnumPropertyItem tmp = {0, "", 0, "", ""}; @@ -2115,7 +2115,7 @@ static float bm_edge_seg_isect(const float sco_a[2], const float sco_b[2], static int edbm_knife_cut_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; ARegion *ar = CTX_wm_region(C); BMVert *bv; @@ -2458,7 +2458,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op) if (ED_operator_editmesh(C)) { Base *base = CTX_data_active_base(C); - BMEditMesh *em = BMEdit_FromObject(base->object); + BMEditMesh *em = BKE_editmesh_from_object(base->object); if (type == 0) { if ((em->bm->totvertsel == 0) && @@ -2561,7 +2561,7 @@ void MESH_OT_separate(wmOperatorType *ot) static int edbm_fill_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const bool use_beauty = RNA_boolean_get(op->ptr, "use_beauty"); BMOperator bmop; @@ -2607,7 +2607,7 @@ void MESH_OT_fill(wmOperatorType *ot) static int edbm_beautify_fill_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!EDBM_op_callf(em, op, "beautify_fill faces=%hf edges=ae", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; @@ -2638,7 +2638,7 @@ void MESH_OT_beautify_fill(wmOperatorType *ot) static int edbm_poke_face_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; const float offset = RNA_float_get(op->ptr, "offset"); @@ -2698,7 +2698,7 @@ void MESH_OT_poke(wmOperatorType *ot) static int edbm_quads_convert_to_tris_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; const bool use_beauty = RNA_boolean_get(op->ptr, "use_beauty"); @@ -2742,7 +2742,7 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot) static int edbm_tris_convert_to_quads_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); int dosharp, douvs, dovcols, domaterials; const float limit = RNA_float_get(op->ptr, "limit"); @@ -2797,7 +2797,7 @@ void MESH_OT_tris_convert_to_quads(wmOperatorType *ot) static int edbm_dissolve_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const bool use_verts = RNA_boolean_get(op->ptr, "use_verts"); @@ -2841,7 +2841,7 @@ void MESH_OT_dissolve(wmOperatorType *ot) static int edbm_dissolve_limited_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; const float angle_limit = RNA_float_get(op->ptr, "angle_limit"); const bool use_dissolve_boundaries = RNA_boolean_get(op->ptr, "use_dissolve_boundaries"); @@ -2917,7 +2917,7 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot) static int edbm_split_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMOperator bmop; EDBM_op_init(em, &bmop, op, "split geom=%hvef use_only_faces=%b", BM_ELEM_SELECT, false); @@ -2984,7 +2984,7 @@ static void sort_bmelem_flag(Scene *scene, Object *ob, const int types, const int flag, const int action, const int reverse, const unsigned int seed) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMVert *ve; BMEdge *ed; @@ -3438,7 +3438,7 @@ static int edbm_sort_elements_exec(bContext *C, wmOperator *op) elem_types = RNA_property_enum_get(op->ptr, prop_elem_types); } else { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); if (em->selectmode & SCE_SELECT_VERTEX) elem_types |= BM_VERT; if (em->selectmode & SCE_SELECT_EDGE) @@ -3542,7 +3542,7 @@ void MESH_OT_sort_elements(wmOperatorType *ot) static int edbm_noise_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); Material *ma; Tex *tex; BMVert *eve; @@ -3613,7 +3613,7 @@ static int edbm_bridge_edge_loops_exec(bContext *C, wmOperator *op) { BMOperator bmop; Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const bool use_merge = RNA_boolean_get(op->ptr, "use_merge"); const float merge_factor = RNA_float_get(op->ptr, "merge_factor"); @@ -3662,7 +3662,7 @@ void MESH_OT_bridge_edge_loops(wmOperatorType *ot) static int edbm_wireframe_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary"); const bool use_even_offset = RNA_boolean_get(op->ptr, "use_even_offset"); @@ -3734,7 +3734,7 @@ void MESH_OT_wireframe(wmOperatorType *ot) static int edbm_convex_hull_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; EDBM_op_init(em, &bmop, op, "convex_hull input=%hvef " @@ -3829,7 +3829,7 @@ void MESH_OT_convex_hull(wmOperatorType *ot) static int mesh_symmetrize_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMOperator bmop; EDBM_op_init(em, &bmop, op, "symmetrize input=%hvef direction=%i", @@ -3871,7 +3871,7 @@ static int edbm_mark_freestyle_edge(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); Mesh *me = (Mesh *)obedit->data; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEdge *eed; BMIter iter; FreestyleEdge *fed; @@ -3933,7 +3933,7 @@ static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); Mesh *me = (Mesh *)obedit->data; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMIter iter; FreestyleFace *ffa; diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 1d776c8b3e7..eb32aee8d43 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -80,7 +80,7 @@ void EDBM_redo_state_restore(BMBackup backup, BMEditMesh *em, int recalctess) tmpbm = NULL; if (recalctess) - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } void EDBM_redo_state_free(BMBackup *backup, BMEditMesh *em, int recalctess) @@ -98,7 +98,7 @@ void EDBM_redo_state_free(BMBackup *backup, BMEditMesh *em, int recalctess) backup->bmcopy = NULL; if (recalctess && em) - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } /* hack to workaround multiple operators being called within the same event loop without an update @@ -184,7 +184,7 @@ bool EDBM_op_init(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const char * } if (!em->emcopy) - em->emcopy = BMEdit_Copy(em); + em->emcopy = BKE_editmesh_copy(em); em->emcopyusers++; va_end(list); @@ -217,7 +217,7 @@ bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool /* when copying, tessellation isn't to for faster copying, * but means we need to re-tessellate here */ if (em->looptris == NULL) { - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } return false; @@ -229,7 +229,7 @@ bool EDBM_op_finish(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const bool } if (em->emcopyusers <= 0) { - BMEdit_Free(em->emcopy); + BKE_editmesh_free(em->emcopy); MEM_freeN(em->emcopy); em->emcopy = NULL; } @@ -253,7 +253,7 @@ bool EDBM_op_callf(BMEditMesh *em, wmOperator *op, const char *fmt, ...) } if (!em->emcopy) - em->emcopy = BMEdit_Copy(em); + em->emcopy = BKE_editmesh_copy(em); em->emcopyusers++; BMO_op_exec(bm, &bmop); @@ -279,7 +279,7 @@ bool EDBM_op_call_and_selectf(BMEditMesh *em, wmOperator *op, const char *select } if (!em->emcopy) - em->emcopy = BMEdit_Copy(em); + em->emcopy = BKE_editmesh_copy(em); em->emcopyusers++; BMO_op_exec(bm, &bmop); @@ -309,7 +309,7 @@ bool EDBM_op_call_silentf(BMEditMesh *em, const char *fmt, ...) } if (!em->emcopy) - em->emcopy = BMEdit_Copy(em); + em->emcopy = BKE_editmesh_copy(em); em->emcopyusers++; BMO_op_exec(bm, &bmop); @@ -322,7 +322,7 @@ void EDBM_selectmode_to_scene(bContext *C) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (!em) return; @@ -353,9 +353,9 @@ void EDBM_mesh_make(ToolSettings *ts, Scene *UNUSED(scene), Object *ob) /* currently executing operators re-tessellates, so we can avoid doing here * but at some point it may need to be added back. */ #if 0 - me->edit_btmesh = BMEdit_Create(bm, true); + me->edit_btmesh = BKE_editmesh_create(bm, true); #else - me->edit_btmesh = BMEdit_Create(bm, false); + me->edit_btmesh = BKE_editmesh_create(bm, false); #endif me->edit_btmesh->selectmode = me->edit_btmesh->bm->selectmode = ts->selectmode; @@ -377,7 +377,7 @@ void EDBM_mesh_load(Object *ob) } /** - * Should only be called on the active editmesh, otherwise call #BMEdit_Free + * Should only be called on the active editmesh, otherwise call #BKE_editmesh_free */ void EDBM_mesh_free(BMEditMesh *em) { @@ -387,7 +387,7 @@ void EDBM_mesh_free(BMEditMesh *em) mesh_octree_table(NULL, NULL, NULL, 'e'); mesh_mirrtopo_table(NULL, 'e'); - BMEdit_Free(em); + BKE_editmesh_free(em); } @@ -650,7 +650,7 @@ static void undoMesh_to_editbtMesh(void *umv, void *em_v, void *UNUSED(obdata)) /* face normals need recalculation since we are not calling through an operator */ BM_mesh_normals_update(bm, true); - em_tmp = BMEdit_Create(bm, true); + em_tmp = BKE_editmesh_create(bm, true); *em = *em_tmp; em->selectmode = um->selectmode; @@ -679,7 +679,7 @@ void undo_push_mesh(bContext *C, const char *name) * this is an easy way to ensure its OK * though we could investigate the matter further. */ Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); em->ob = obedit; undo_editmode_push(C, name, getEditMesh, free_undo, undoMesh_to_editbtMesh, editbtMesh_to_undoMesh, NULL); @@ -1166,7 +1166,7 @@ void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const bool use_select) ED_mesh_mirrtopo_init(me, -1, &mesh_topo_store, true); } else { - tree = BMBVH_NewBVH(em, 0, NULL); + tree = BKE_bmbvh_new(em, 0, NULL); } BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { @@ -1184,7 +1184,7 @@ void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const bool use_select) } else { float co[3] = {-v->co[0], v->co[1], v->co[2]}; - mirr = BMBVH_FindClosestVert(tree, co, BM_SEARCH_MAXDIST_MIRR); + mirr = BKE_bmbvh_find_vert_closest(tree, co, BM_SEARCH_MAXDIST_MIRR); } if (mirr && mirr != v) { @@ -1204,7 +1204,7 @@ void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const bool use_select) ED_mesh_mirrtopo_free(&mesh_topo_store); } else { - BMBVH_FreeBVH(tree); + BKE_bmbvh_free(tree); } em->mirror_cdlayer = li; @@ -1358,7 +1358,7 @@ void EDBM_update_generic(BMEditMesh *em, const bool do_tessface, const bool is_d WM_main_add_notifier(NC_GEOM | ND_DATA, ob->data); if (do_tessface) { - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } if (is_destructive) { @@ -1391,7 +1391,7 @@ int BMBVH_VertVisible(BMBVHTree *tree, BMEdge *e, RegionView3D *r3d) static BMFace *edge_ray_cast(struct BMBVHTree *tree, const float co[3], const float dir[3], float *r_hitout, BMEdge *e) { - BMFace *f = BMBVH_RayCast(tree, co, dir, r_hitout, NULL); + BMFace *f = BKE_bmbvh_ray_cast(tree, co, dir, r_hitout, NULL); if (f && BM_edge_in_face(f, e)) return NULL; diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 8fbc6c7ae9d..71db90e3ac4 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -1275,7 +1275,7 @@ void ED_mesh_calc_normals(Mesh *mesh) void ED_mesh_calc_tessface(Mesh *mesh) { if (mesh->edit_btmesh) { - BMEdit_RecalcTessellation(mesh->edit_btmesh); + BKE_editmesh_tessface_calc(mesh->edit_btmesh); } else { BKE_mesh_tessface_calc(mesh); diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 6769301373a..7a1fdd71b20 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -332,7 +332,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, } ED_object_editmode_enter(C, EM_DO_UNDO | EM_IGNORE_LAYER); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!createob) { /* clear */ @@ -498,7 +498,7 @@ void MESH_OT_navmesh_make(wmOperatorType *ot) static int navmesh_face_copy_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); /* do work here */ BMFace *efa_act = BM_active_face_get(em->bm, false, false); @@ -586,7 +586,7 @@ static int findFreeNavPolyIndex(BMEditMesh *em) static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op)) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *ef; BMIter iter; diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 06f920ef16c..303212d5a58 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -182,7 +182,7 @@ static int ED_operator_editmesh_face_select(bContext *C) { Object *obedit = CTX_data_edit_object(C); if (obedit && obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (em && em->selectmode & SCE_SELECT_FACE) { return 1; } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a3f7e0f23d9..55b1da38b5c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -476,11 +476,11 @@ void ED_object_editmode_enter(bContext *C, int flag) EDBM_mesh_make(CTX_data_tool_settings(C), scene, ob); - em = BMEdit_FromObject(ob); + em = BKE_editmesh_from_object(ob); if (LIKELY(em)) { /* order doesn't matter */ EDBM_mesh_normals_update(em); - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); BM_mesh_select_mode_flush(em->bm); } diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index f0ab55e1e0f..e3a679e8bc3 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -315,7 +315,7 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int * em = me->edit_btmesh; EDBM_mesh_normals_update(em); - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); /* check selected vertices first */ if (return_editmesh_indexar(em, tot, indexar, cent_r)) { diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 9e49cc64c6c..e89c581a7b6 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1518,7 +1518,7 @@ static void skin_root_clear(BMesh *bm, BMVert *bm_vert, GHash *visited) static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMesh *bm = em->bm; BMVert *bm_vert; BMIter bm_iter; @@ -1574,7 +1574,7 @@ typedef enum { static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMesh *bm = em->bm; BMVert *bm_vert; BMIter bm_iter; @@ -1632,7 +1632,7 @@ void OBJECT_OT_skin_loose_mark_clear(wmOperatorType *ot) static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMesh *bm = em->bm; BMVert *bm_vert; BMIter bm_iter; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 48ef663592a..9ed57adf207 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -140,7 +140,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) em = me->edit_btmesh; EDBM_mesh_normals_update(em); - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); /* derivedMesh might be needed for solving parenting, * so re-create it here */ diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 487a8ad4bc0..38a26447cb0 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -109,7 +109,7 @@ static Lattice *vgroup_edit_lattice(Object *ob) bool ED_vgroup_object_is_edit_mode(Object *ob) { if (ob->type == OB_MESH) - return (BMEdit_FromObject(ob) != NULL); + return (BKE_editmesh_from_object(ob) != NULL); else if (ob->type == OB_LATTICE) return (((Lattice *)ob->data)->editlatt != NULL); @@ -1662,7 +1662,7 @@ static void vgroup_blend(Object *ob, const float fac) if (BLI_findlink(&ob->defbase, def_nr)) { const float ifac = 1.0f - fac; - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMesh *bm = em ? em->bm : NULL; Mesh *me = em ? NULL : ob->data; @@ -2446,7 +2446,7 @@ static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg) static bool vgroup_object_in_edit_mode(Object *ob) { if (ob->type == OB_MESH) - return (BMEdit_FromObject(ob) != NULL); + return (BKE_editmesh_from_object(ob) != NULL); else if (ob->type == OB_LATTICE) return (((Lattice *)ob->data)->editlatt != NULL); @@ -3502,7 +3502,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op) if (ob->mode == OB_MODE_EDIT) { if (ob->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMIter iter; BMVert *eve; diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index c7229115637..7a274396e86 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -174,7 +174,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) if (ob && ob->actcol > 0) { if (ob->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMFace *efa; BMIter iter; @@ -235,7 +235,7 @@ static int material_slot_de_select(bContext *C, int select) return OPERATOR_CANCELLED; if (ob->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); if (em) { EDBM_deselect_by_material(em, ob->actcol - 1, select); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 206824d4668..4fe75944b74 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -333,7 +333,7 @@ int ED_operator_editmesh(bContext *C) { Object *obedit = CTX_data_edit_object(C); if (obedit && obedit->type == OB_MESH) - return NULL != BMEdit_FromObject(obedit); + return NULL != BKE_editmesh_from_object(obedit); return 0; } @@ -434,7 +434,7 @@ int ED_operator_uvmap(bContext *C) BMEditMesh *em = NULL; if (obedit && obedit->type == OB_MESH) { - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); } if (em && (em->bm->totface)) { diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index c8bd31d0c2a..250594459f3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -168,7 +168,7 @@ static int uv_sculpt_brush_poll(bContext *C) if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH) return 0; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); ret = EDBM_mtexpoly_check(em); if (ret && sima) { @@ -362,7 +362,7 @@ static void uv_sculpt_stroke_apply(bContext *C, wmOperator *op, const wmEvent *e float co[2], radius, radius_root; Scene *scene = CTX_data_scene(C); ARegion *ar = CTX_wm_region(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); unsigned int tool; UvSculptData *sculptdata = (UvSculptData *)op->customdata; SpaceImage *sima; @@ -533,7 +533,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, const wm Object *obedit = CTX_data_edit_object(C); ToolSettings *ts = scene->toolsettings; UvSculptData *data = MEM_callocN(sizeof(*data), "UV Smooth Brush Data"); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; op->customdata = data; diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 45acf25a388..c78a902fca9 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -310,7 +310,7 @@ int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) return 0; if (obedit && obedit->type == OB_MESH) { - struct BMEditMesh *em = BMEdit_FromObject(obedit); + struct BMEditMesh *em = BKE_editmesh_from_object(obedit); int ret; ret = EDBM_mtexpoly_check(em); @@ -328,7 +328,7 @@ int ED_space_image_show_uvshadow(SpaceImage *sima, Object *obedit) if (ED_space_image_show_paint(sima)) if (obedit && obedit->type == OB_MESH) { - struct BMEditMesh *em = BMEdit_FromObject(obedit); + struct BMEditMesh *em = BKE_editmesh_from_object(obedit); int ret; ret = EDBM_mtexpoly_check(em); diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 9ec05159627..98c9c8d15fe 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -138,7 +138,7 @@ static void stats_object(Object *ob, int sel, int totob, SceneStats *stats) static void stats_object_edit(Object *obedit, SceneStats *stats) { if (obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); stats->totvert = em->bm->totvert; stats->totvertsel = em->bm->totvertsel; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index b7ebee49c48..2d6d004a318 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -391,7 +391,7 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C) uiBlockSetHandleFunc(block, do_view3d_header_buttons, NULL); if (obedit && (obedit->type == OB_MESH)) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); uiLayout *row; row = uiLayoutRow(layout, TRUE); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index a2529332f93..efafae5cb55 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -482,7 +482,7 @@ static void do_lasso_select_mesh(ViewContext *vc, const int mcords[][2], short m int bbsel; /* set editmesh */ - vc->em = BMEdit_FromObject(vc->obedit); + vc->em = BKE_editmesh_from_object(vc->obedit); BLI_lasso_boundbox(&rect, mcords, moves); @@ -2077,7 +2077,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) if (vc.obedit) { switch (vc.obedit->type) { case OB_MESH: - vc.em = BMEdit_FromObject(vc.obedit); + vc.em = BKE_editmesh_from_object(vc.obedit); ret = do_mesh_box_select(&vc, &rect, select, extend); // if (EM_texFaceCheck()) if (ret & OPERATOR_FINISHED) { @@ -2339,7 +2339,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f bbsel = EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0f)); ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */ - vc->em = BMEdit_FromObject(vc->obedit); + vc->em = BKE_editmesh_from_object(vc->obedit); view3d_userdata_circleselect_init(&data, vc, select, mval, rad); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 39d00badfaf..3458aa48833 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -100,7 +100,7 @@ static void special_transvert_update(Object *obedit) DAG_id_tag_update(obedit->data, 0); if (obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BM_mesh_normals_update(em->bm, true); /* does face centers too */ } else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { @@ -251,7 +251,7 @@ static void make_trans_verts(Object *obedit, float min[3], float max[3], int mod zero_v3(centroid); if (obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMIter iter; void *userdata[2] = {em, NULL}; @@ -1005,7 +1005,7 @@ static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op)) if (obedit) { if (obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); /* check active */ BMEditSelection ese; diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 8ee2796c7e7..487c26aaf54 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5146,7 +5146,7 @@ static void calcNonProportionalEdgeSlide(TransInfo *t, EdgeSlideData *sld, const static int createEdgeSlideVerts(TransInfo *t) { - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); BMesh *bm = em->bm; BMIter iter; BMEdge *e, *e1; @@ -5176,7 +5176,7 @@ static int createEdgeSlideVerts(TransInfo *t) use_btree_disp = (v3d && t->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE); if (use_btree_disp) { - btree = BMBVH_NewBVH(em, BMBVH_RESPECT_HIDDEN, NULL); + btree = BKE_bmbvh_new(em, BMBVH_RESPECT_HIDDEN, NULL); } else { btree = NULL; @@ -5216,7 +5216,7 @@ static int createEdgeSlideVerts(TransInfo *t) if (numsel == 0 || numsel > 2) { MEM_freeN(sld); if (btree) - BMBVH_FreeBVH(btree); + BKE_bmbvh_free(btree); return 0; /* invalid edge selection */ } } @@ -5227,7 +5227,7 @@ static int createEdgeSlideVerts(TransInfo *t) if (!BM_edge_is_manifold(e)) { MEM_freeN(sld); if (btree) - BMBVH_FreeBVH(btree); + BKE_bmbvh_free(btree); return 0; /* can only handle exactly 2 faces around each edge */ } } @@ -5248,7 +5248,7 @@ static int createEdgeSlideVerts(TransInfo *t) if (!j) { MEM_freeN(sld); if (btree) - BMBVH_FreeBVH(btree); + BKE_bmbvh_free(btree); return 0; } @@ -5513,7 +5513,7 @@ static int createEdgeSlideVerts(TransInfo *t) BLI_smallhash_release(&table); if (btree) { - BMBVH_FreeBVH(btree); + BKE_bmbvh_free(btree); } MEM_freeN(loop_dir); MEM_freeN(loop_maxdist); @@ -6091,7 +6091,7 @@ static void calcVertSlideMouseActiveEdges(struct TransInfo *t, const int mval[2] static int createVertSlideVerts(TransInfo *t) { - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); BMesh *bm = em->bm; BMIter iter; BMIter eiter; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 37ffa17210a..0e44230b326 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -286,7 +286,7 @@ static void createTransTexspace(TransInfo *t) static void createTransEdge(TransInfo *t) { - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); TransData *td = NULL; BMEdge *eed; BMIter iter; @@ -1968,7 +1968,7 @@ static void createTransEditVerts(TransInfo *t) ToolSettings *ts = t->scene->toolsettings; TransData *tob = NULL; TransDataExtension *tx = NULL; - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); BMesh *bm = em->bm; BMVert *eve; BMIter iter; @@ -2408,7 +2408,7 @@ static void createTransUVs(bContext *C, TransInfo *t) TransData2D *td2d = NULL; MTexPoly *tf; MLoopUV *luv; - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -5472,7 +5472,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) } else if (t->obedit) { if (t->obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); /* table needs to be created for each edit command, since vertices can move etc */ mesh_octree_table(t->obedit, em, NULL, 'e'); } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 444410cf94e..be82a4e0660 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -742,7 +742,7 @@ static void recalcData_view3d(TransInfo *t) if (la->editlatt->latt->flag & LT_OUTSIDE) outside_lattice(la->editlatt->latt); } else if (t->obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); /* mirror modifier clipping? */ if (t->state != TRANS_CANCEL) { /* apply clipping after so we never project past the clip plane [#25423] */ @@ -755,7 +755,7 @@ static void recalcData_view3d(TransInfo *t) DAG_id_tag_update(t->obedit->data, 0); /* sets recalc flags */ EDBM_mesh_normals_update(em); - BMEdit_RecalcTessellation(em); + BKE_editmesh_tessface_calc(em); } else if (t->obedit->type == OB_ARMATURE) { /* no recalc flag, does pose */ bArmature *arm = t->obedit->data; @@ -1610,7 +1610,7 @@ void calculateCenter(TransInfo *t) if (t->obedit) { if (t->obedit && t->obedit->type == OB_MESH) { BMEditSelection ese; - BMEditMesh *em = BMEdit_FromObject(t->obedit); + BMEditMesh *em = BKE_editmesh_from_object(t->obedit); if (BM_select_history_active_get(em->bm, &ese)) { BM_editselection_center(&ese, t->center); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index a8f740b7c5a..18ad9402116 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -293,7 +293,7 @@ int calc_manipulator_stats(const bContext *C) if ((ob->lay & v3d->lay) == 0) return 0; if (obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEditSelection ese; float vec[3] = {0, 0, 0}; diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index bdfd9df6246..546d02533fb 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -528,7 +528,7 @@ static int skin_resize_poll(bContext *C) { struct Object *obedit = CTX_data_edit_object(C); if (obedit && obedit->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); return (em && CustomData_has_layer(&em->bm->vdata, CD_MVERT_SKIN)); } return 0; diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 23dc4128396..6090c2f2700 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -570,7 +570,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], ob = obedit; if (ob->type == OB_MESH) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); BMVert *eve; BMEditSelection ese; float vec[3] = {0, 0, 0}; diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index b4b4d2c2581..da443075118 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1528,7 +1528,7 @@ static bool snapObject(Scene *scene, short snap_mode, ARegion *ar, Object *ob, i DerivedMesh *dm; if (editobject) { - em = BMEdit_FromObject(ob); + em = BKE_editmesh_from_object(ob); /* dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH); */ dm = editbmesh_get_derived_base(ob, em); /* limitation, em & dm MUST have the same number of faces */ } @@ -1835,7 +1835,7 @@ static bool peelObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, val = peelDerivedMesh(dob, dm, dob->obmat, ray_start, ray_normal, mval, depth_peels); } else { - em = BMEdit_FromObject(dob); + em = BKE_editmesh_from_object(dob); dm = editbmesh_get_derived_cage(scene, obedit, em, CD_MASK_BAREMESH); val = peelDerivedMesh(dob, dm, dob->obmat, ray_start, ray_normal, mval, depth_peels); @@ -1860,7 +1860,7 @@ static bool peelObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, dm->release(dm); } else if (ob == obedit && mode != SNAP_NOT_OBEDIT) { - BMEditMesh *em = BMEdit_FromObject(ob); + BMEditMesh *em = BKE_editmesh_from_object(ob); DerivedMesh *dm = editbmesh_get_derived_cage(scene, obedit, em, CD_MASK_BAREMESH); val = peelDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, depth_peels); diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 4b71d1e9267..064a51a639f 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -134,7 +134,7 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block) ED_space_image_get_size(sima, &imx, &imy); - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (uvedit_center(scene, em, ima, center)) { copy_v2_v2(uvedit_old_center, center); @@ -175,7 +175,7 @@ static void do_uvedit_vertex(bContext *C, void *UNUSED(arg), int event) if (event != B_UVEDIT_VERTEX) return; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); ED_space_image_get_size(sima, &imx, &imy); uvedit_center(scene, em, ima, center); diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index c70d2376cd6..f6d279c5fac 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -128,7 +128,7 @@ static int draw_uvs_face_check(Scene *scene) static void draw_uvs_shadow(Object *obedit) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMFace *efa; BMLoop *l; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index a891826fbd6..7fbcfa1c941 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -98,7 +98,7 @@ int ED_uvedit_test(Object *obedit) if (obedit->type != OB_MESH) return 0; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); ret = EDBM_mtexpoly_check(em); return ret; @@ -183,7 +183,7 @@ void ED_uvedit_assign_image(Main *UNUSED(bmain), Scene *scene, Object *obedit, I if (!obedit || (obedit->type != OB_MESH)) return; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); if (!em || !em->bm->totface) { return; } @@ -286,7 +286,7 @@ static int uvedit_set_tile(Object *obedit, Image *ima, int curtile) if (ima->type == IMA_TYPE_R_RESULT || ima->type == IMA_TYPE_COMPOSITE) return 0; - em = BMEdit_FromObject(obedit); + em = BKE_editmesh_from_object(obedit); cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY); @@ -601,7 +601,7 @@ void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float as int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2]) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -634,7 +634,7 @@ int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], f static int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[2]) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -883,7 +883,7 @@ void uv_find_nearest_vert(Scene *scene, Image *ima, BMEditMesh *em, int ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, const float co[2], float r_uv[2]) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -1326,7 +1326,7 @@ static float *uv_sel_co_from_eve(Scene *scene, Image *ima, BMEditMesh *em, BMVer static void uv_weld_align(bContext *C, int tool) { Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); SpaceImage *sima; Scene *scene; Image *ima; @@ -1597,7 +1597,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op) SpaceImage *sima; Scene *scene; Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); Image *ima; MTexPoly *tf; int uv_a_index; @@ -1853,7 +1853,7 @@ static int uv_select_all_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); int action = RNA_enum_get(op->ptr, "action"); @@ -1911,7 +1911,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo ToolSettings *ts = scene->toolsettings; Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -2316,7 +2316,7 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent ToolSettings *ts = scene->toolsettings; Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); float limit[2]; int extend; @@ -2420,7 +2420,7 @@ static int uv_select_split_exec(bContext *C, wmOperator *op) ToolSettings *ts = scene->toolsettings; Image *ima = CTX_data_edit_image(C); Object *obedit = CTX_data_edit_object(C); - BMesh *bm = BMEdit_FromObject(obedit)->bm; + BMesh *bm = BKE_editmesh_from_object(obedit)->bm; BMFace *efa; BMLoop *l; @@ -2505,7 +2505,7 @@ static int uv_unlink_selection_exec(bContext *C, wmOperator *op) ToolSettings *ts = scene->toolsettings; Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -2600,7 +2600,7 @@ static void uv_faces_do_sticky(SpaceImage *sima, Scene *scene, Object *obedit, s * selection (so for sticky modes, vertex or location based). */ ToolSettings *ts = scene->toolsettings; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -2728,7 +2728,7 @@ static int uv_border_select_exec(bContext *C, wmOperator *op) Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); ARegion *ar = CTX_wm_region(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -2879,7 +2879,7 @@ static int uv_circle_select_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); ToolSettings *ts = scene->toolsettings; Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ARegion *ar = CTX_wm_region(C); BMFace *efa; BMLoop *l; @@ -2985,7 +2985,7 @@ static int do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short mov Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); ToolSettings *ts = scene->toolsettings; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); const int use_face_center = (ts->uv_flag & UV_SYNC_SELECTION) ? (ts->selectmode == SCE_SELECT_FACE) : (ts->uv_selectmode == UV_SELECT_FACE); @@ -3175,7 +3175,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) static int uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, SpaceImage *sima) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -3205,7 +3205,7 @@ static int uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, Space static int uv_snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obedit) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMesh *bm = em->bm; BMFace *f; BMLoop *l, *lsub; @@ -3263,7 +3263,7 @@ static int uv_snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object * static int uv_snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); Image *ima = sima->image; BMFace *efa; BMLoop *l; @@ -3358,7 +3358,7 @@ static int uv_pin_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -3416,7 +3416,7 @@ static int uv_select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); Image *ima = CTX_data_edit_image(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -3488,7 +3488,7 @@ static int uv_hide_exec(bContext *C, wmOperator *op) Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); ToolSettings *ts = scene->toolsettings; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -3604,7 +3604,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *UNUSED(op)) Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); ToolSettings *ts = scene->toolsettings; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 44918e9d495..c7977689bc4 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1611,7 +1611,7 @@ static int stitch_init(bContext *C, wmOperator *op) /* initialize state */ state->use_limit = RNA_boolean_get(op->ptr, "use_limit"); state->limit_dist = RNA_float_get(op->ptr, "limit"); - state->em = em = BMEdit_FromObject(obedit); + state->em = em = BKE_editmesh_from_object(obedit); state->snap_islands = RNA_boolean_get(op->ptr, "snap_islands"); state->static_island = RNA_int_get(op->ptr, "static_island"); state->midpoints = RNA_boolean_get(op->ptr, "midpoint_snap"); diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 69f6daeeb19..ba85b7e1a74 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -108,7 +108,7 @@ static void modifier_unwrap_state(Object *obedit, Scene *scene, short *use_subsu static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit) { Main *bmain = CTX_data_main(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMIter iter; Image *ima; @@ -560,7 +560,7 @@ static bool minimize_stretch_init(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); MinStretch *ms; int fill_holes = RNA_boolean_get(op->ptr, "fill_holes"); bool implicit = true; @@ -761,7 +761,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ParamHandle *handle; bool implicit = true; @@ -808,7 +808,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ParamHandle *handle; bool implicit = true; @@ -847,7 +847,7 @@ static ParamHandle *liveHandle = NULL; void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); short abf = scene->toolsettings->unwrapper == 0; short fillholes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES; short use_subsurf; @@ -887,7 +887,7 @@ void ED_uvedit_live_unwrap_end(short cancel) void ED_uvedit_live_unwrap(Scene *scene, Object *obedit) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); if (scene->toolsettings->edge_mode_live_unwrap && CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV)) @@ -1000,7 +1000,7 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float /* context checks are messy here, making it work in both 3d view and uv editor */ Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); /* common operator properties */ @@ -1178,7 +1178,7 @@ static void uv_map_clip_correct(Scene *scene, Object *ob, BMEditMesh *em, wmOper /* assumes UV Map is checked, doesn't run update funcs */ void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel) { - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ParamHandle *handle; const short fill_holes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES; @@ -1208,7 +1208,7 @@ static int unwrap_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); int method = RNA_enum_get(op->ptr, "method"); int fill_holes = RNA_boolean_get(op->ptr, "fill_holes"); int correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect"); @@ -1303,7 +1303,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); Camera *camera = NULL; - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = CTX_wm_region_view3d(C); @@ -1500,7 +1500,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -1579,7 +1579,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; @@ -1644,7 +1644,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *obedit = CTX_data_edit_object(C); - BMEditMesh *em = BMEdit_FromObject(obedit); + BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; BMIter iter, liter; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index fbaa6f83f09..6bd92ac9da8 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -90,7 +90,7 @@ typedef struct Mesh { struct MCol *mcol; struct Mesh *texcomesh; - /* When the object is available, the preferred access method is: BMEdit_FromObject(ob) */ + /* When the object is available, the preferred access method is: BKE_editmesh_from_object(ob) */ struct BMEditMesh *edit_btmesh; /* not saved in file! */ struct CustomData vdata, edata, fdata; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 7d5bd324647..0eb7ab8e581 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -275,7 +275,7 @@ static void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA EDBM_mesh_load(ob); EDBM_mesh_make(scene->toolsettings, scene, ob); EDBM_mesh_normals_update(((Mesh *)ob->data)->edit_btmesh); - BMEdit_RecalcTessellation(((Mesh *)ob->data)->edit_btmesh); + BKE_editmesh_tessface_calc(((Mesh *)ob->data)->edit_btmesh); break; case OB_CURVE: case OB_SURF: -- cgit v1.2.3