diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 06:42:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 06:42:50 +0400 |
commit | 7be1cd733dfe064d1976b706610c39f97e536b90 (patch) | |
tree | e32dac240ff50881ddb01c09994ecae92790df3f /source/blender/editors/mesh/knifetool.c | |
parent | 992087a0dec3f58259c8ace39b82df07536ec586 (diff) |
more bmesh minor api cleanup
* remove BMO_elem_flag_* functions, since there are already defines for this.
* ifdef unused bevel functions.
* rename defines BMOP_ --> BMO_OP_
Diffstat (limited to 'source/blender/editors/mesh/knifetool.c')
-rwxr-xr-x | source/blender/editors/mesh/knifetool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index a65da59364d..146fa88479e 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -1736,7 +1736,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) int i, j, k = 0, totface = bm->totface; BMO_push(bm, NULL); - bmesh_begin_edit(bm, BMOP_UNTAN_MULTIRES); + bmesh_begin_edit(bm, BMO_OP_FLAG_UNTAN_MULTIRES); /* BMESH_TODO this should be valid now, leaving here until we can ensure this - campbell */ i = 0; @@ -1946,7 +1946,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) fprintf(stderr, "%s: face index out of range! (bmesh internal error)\n", __func__); } - BM_elem_copy_attrs(bm, bm, f2, f); + BM_elem_attrs_copy(bm, bm, f2, f); BM_ITER(l1, &liter1, bm, BM_LOOPS_OF_FACE, f) { BM_loop_interp_from_face(bm, l1, f2, TRUE, TRUE); @@ -1970,7 +1970,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BMO_error_clear(bm); /* remerge_faces sometimes raises errors, so make sure to clear them */ - bmesh_end_edit(bm, BMOP_UNTAN_MULTIRES); + bmesh_end_edit(bm, BMO_OP_FLAG_UNTAN_MULTIRES); BMO_pop(bm); } |