From e95c0fba095dfac38b33b5ad7db36316093e2acf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Jan 2020 14:20:49 +1100 Subject: BMesh: remove BMEditMesh.ob use BKE_editmesh_lnorspace_* API Note that this is a bit clumsy having both edit-mesh and mesh, BKE_editmesh_ensure_autosmooth & BKE_editmesh_lnorspace_update are often called together, these could be made into a single functions. --- source/blender/blenkernel/intern/editmesh.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/editmesh.c') diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index d7c52fc16ae..9b67a4fb925 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -226,7 +226,7 @@ float (*BKE_editmesh_vert_coords_alloc_orco(BMEditMesh *em, int *r_vert_len))[3] return BM_mesh_vert_coords_alloc(em->bm, r_vert_len); } -void BKE_editmesh_lnorspace_update(BMEditMesh *em) +void BKE_editmesh_lnorspace_update(BMEditMesh *em, Mesh *me) { BMesh *bm = em->bm; @@ -238,7 +238,6 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em) * with related sharp edges (and hence autosmooth is 'lost'). * Not sure how critical this is, and how to fix that issue? */ if (!CustomData_has_layer(&bm->ldata, CD_CUSTOMLOOPNORMAL)) { - Mesh *me = em->ob->data; if (me->flag & ME_AUTOSMOOTH) { BM_edges_sharp_from_angle_set(bm, me->smoothresh); } @@ -248,12 +247,11 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em) } /* If autosmooth not already set, set it */ -void BKE_editmesh_ensure_autosmooth(BMEditMesh *em) +void BKE_editmesh_ensure_autosmooth(BMEditMesh *em, Mesh *me) { - Mesh *me = em->ob->data; if (!(me->flag & ME_AUTOSMOOTH)) { me->flag |= ME_AUTOSMOOTH; - BKE_editmesh_lnorspace_update(em); + BKE_editmesh_lnorspace_update(em, me); } } -- cgit v1.2.3