diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh_knife.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; |