blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

BMesh: remove BMEditMesh.ob use for select mirror

This commit is contained in:
Campbell Barton 2020-01-07 14:45:01 +11:00
parent 8bdac377d8
commit 9d7abce359
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/include/ED_mesh.h
View File

@ -154,8 +154,12 @@ void EDBM_automerge_and_split(struct Object *ob,
void ED_mesh_undosys_type(struct UndoType *ut);
/* editmesh_select.c */
void EDBM_select_mirrored(
struct BMEditMesh *em, const int axis, const bool extend, int *r_totmirr, int *r_totfail);
void EDBM_select_mirrored(struct BMEditMesh *em,
const struct Mesh *me,
const int axis,
const bool extend,
int *r_totmirr,
int *r_totfail);
struct BMVert *EDBM_vert_find_nearest_ex(struct ViewContext *vc,
float *r_dist,

13
source/blender/editors/mesh/editmesh_select.c
View File

@ -75,15 +75,18 @@
/** \name Select Mirror
* \{ */
void EDBM_select_mirrored(
BMEditMesh *em, const int axis, const bool extend, int *r_totmirr, int *r_totfail)
void EDBM_select_mirrored(BMEditMesh *em,
const Mesh *me,
const int axis,
const bool extend,
int *r_totmirr,
int *r_totfail)
{
Mesh *me = (Mesh *)em->ob->data;
BMesh *bm = em->bm;
BMIter iter;
int totmirr = 0;
int totfail = 0;
bool use_topology = (me && (me->editflag & ME_EDIT_MIRROR_TOPO));
bool use_topology = me->editflag & ME_EDIT_MIRROR_TOPO;
*r_totmirr = *r_totfail = 0;
@ -3863,7 +3866,7 @@ static int edbm_select_mirror_exec(bContext *C, wmOperator *op)
for (int axis = 0; axis < 3; axis++) {
if ((1 << axis) & axis_flag) {
EDBM_select_mirrored(em, axis, extend, &tot_mirr_iter, &tot_fail_iter);
EDBM_select_mirrored(em, obedit->data, axis, extend, &tot_mirr_iter, &tot_fail_iter);
}
}