diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-17 04:39:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-17 07:55:06 +0400 |
| commit | 7df8452d1a7edbb920e184435d73d90f3df3e3ac (patch) | |
| tree | c4e9c2937f799ff022c68929d4df56033064851c /source/blender/modifiers/intern/MOD_skin.c | |
| parent | 5c74ac2c2a41e70b487321fc6e1afb2625704b1c (diff) | |
BMesh: add bmesh delete functions that dont depend on operator flags
Diffstat (limited to 'source/blender/modifiers/intern/MOD_skin.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index a031cd10ca8..73297c00084 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -311,10 +311,10 @@ static int build_hull(SkinOutput *so, Frame **frames, int totframe) /* Check if removing triangles above will create wire triangles, * mark them too */ BMO_ITER (e, &oiter, op.slots_out, "geom.out", BM_EDGE) { - int is_wire = TRUE; + bool is_wire = true; BM_ITER_ELEM (f, &iter, e, BM_FACES_OF_EDGE) { if (!BM_elem_flag_test(f, BM_ELEM_TAG)) { - is_wire = FALSE; + is_wire = false; break; } } @@ -324,9 +324,7 @@ static int build_hull(SkinOutput *so, Frame **frames, int totframe) BMO_op_finish(bm, &op); - BMO_op_callf(bm, BMO_FLAG_DEFAULTS, - "delete geom=%hef context=%i", - BM_ELEM_TAG, DEL_ONLYTAGGED); + BM_mesh_delete_hflag_context(bm, BM_ELEM_TAG, DEL_ONLYTAGGED); return TRUE; } @@ -1426,11 +1424,10 @@ static void hull_merge_triangles(SkinOutput *so, const SkinModifierData *smd) } } - BMO_op_callf(so->bm, BMO_FLAG_DEFAULTS, - "delete geom=%hef context=%i", - BM_ELEM_TAG, DEL_ONLYTAGGED); - BLI_heap_free(heap, NULL); + + BM_mesh_delete_hflag_context(so->bm, BM_ELEM_TAG, DEL_ONLYTAGGED); + } static void skin_merge_close_frame_verts(SkinNode *skin_nodes, int totvert, |