diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-19 12:36:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-19 12:36:27 +0400 |
| commit | 6f104aad3ad8753358b3047a556f63cb73c04ef2 (patch) | |
| tree | b74cef45c2148c561136d616dfd6dcce5be09584 /source/blender/bmesh/operators/bmo_removedoubles.c | |
| parent | e9da46aec980c8bd0838b9dd23ada463c03309a5 (diff) | |
code cleanup: bmesh api - make arg order consistent - htype before hflag or oflag.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_removedoubles.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 8d657e7b677..a97ed6d9dfd 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -368,7 +368,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op) BMO_op_callf(bm, "collapse_uvs edges=%s", op, "edges"); BMO_op_init(bm, &weldop, "weldverts"); - BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_MARK, BM_EDGE); + 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, @@ -427,7 +427,7 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) /* clear all short flags */ BMO_mesh_flag_disable_all(bm, op, BM_ALL, (1 << 16) - 1); - BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_MARK, BM_EDGE); + 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, @@ -504,7 +504,7 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c /* Flag keepverts */ if (keepvert) { - BMO_slot_buffer_flag_enable(bm, op, "keepverts", VERT_KEEP, BM_VERT); + BMO_slot_buffer_flag_enable(bm, op, "keepverts", BM_VERT, VERT_KEEP); } len = BLI_array_count(verts); @@ -571,7 +571,7 @@ void bmo_automerge_exec(BMesh *bm, BMOperator *op) /* The "verts" input sent to this op is the set of verts that * can be merged away into any other verts. Mark all other verts * as VERT_KEEP. */ - BMO_slot_buffer_flag_enable(bm, op, "verts", VERT_IN, BM_VERT); + BMO_slot_buffer_flag_enable(bm, op, "verts", BM_VERT, VERT_IN); BM_ITER(v, &viter, bm, BM_VERTS_OF_MESH, NULL) { if (!BMO_elem_flag_test(bm, v, VERT_IN)) { BMO_elem_flag_enable(bm, v, VERT_KEEP); |