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_removedoubles.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_removedoubles.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 5bf40e6fd38..79b2e0773d4 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -376,7 +376,8 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op) BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK); BMW_init(&walker, bm, BMW_SHELL, - BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, BMW_MASK_NOP, + BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, + BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ BMW_NIL_LAY); BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { @@ -435,7 +436,8 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK); BMW_init(&walker, bm, BMW_LOOPDATA_ISLAND, - BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, BMW_MASK_NOP, + BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, + BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ layer); BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { |