diff options
Diffstat (limited to 'source/blender/editors/transform')
7 files changed, 20 insertions, 20 deletions
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); |