diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 17:09:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 17:09:07 +0400 |
commit | f87c5b3453a779ebe96afff734c0ca6da1a03f8d (patch) | |
tree | 728f95166c77cc6c73b3e637860e19ca8b61cbb0 /source/blender/bmesh/operators/bmo_dissolve.c | |
parent | 7474397f854cbe23bd7e55dc46469c722d8eda9c (diff) |
fix [#30715] bmesh: select linked not ignoring hidden verts/edges/faces
add optional flag to ignore hidden elements.
also remove loop mask flag - since it wasnt used and vert/edge/face is enough.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_dissolve.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 20bc01dfa22..fe5c8cd048e 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -47,8 +47,10 @@ static int UNUSED_FUNCTION(check_hole_in_region)(BMesh *bm, BMFace *f) /* checks if there are any unmarked boundary edges in the face regio */ BMW_init(®walker, bm, BMW_ISLAND, - BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK, + BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK, + BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ BMW_NIL_LAY); + f2 = BMW_begin(®walker, f); for ( ; f2; f2 = BMW_step(®walker)) { l2 = BM_iter_new(&liter2, bm, BM_LOOPS_OF_FACE, f2); @@ -106,7 +108,8 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op) /* yay, walk */ BMW_init(®walker, bm, BMW_ISLAND, - BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK, + BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK, + BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ BMW_NIL_LAY); f2 = BMW_begin(®walker, f); |