diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-12-09 14:19:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-09 14:19:26 +0300 |
commit | 6076bedec002b92e5f316a15a45a8cdaf686aa33 (patch) | |
tree | b2caf79aca16bb3c10f455d09f0cfd6217233d05 /source/blender/bmesh/intern | |
parent | 83cbcefac8349d5ff46b721318ca180dd8817af5 (diff) |
Cleanup: remove scanfill define for polyfill code
also rename vars which were previously used for scanfill.
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 18 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 13 |
2 files changed, 17 insertions, 14 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 4a1ab86a3fc..4733265d5b4 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -742,13 +742,15 @@ bool BM_face_point_inside_test(BMFace *f, const float co[3]) * * \note use_tag tags new flags and edges. */ -void BM_face_triangulate(BMesh *bm, BMFace *f, - BMFace **r_faces_new, - int *r_faces_new_tot, - MemArena *sf_arena, - const int quad_method, - const int ngon_method, - const bool use_tag) +void BM_face_triangulate( + BMesh *bm, BMFace *f, + BMFace **r_faces_new, + int *r_faces_new_tot, + const int quad_method, + const int ngon_method, + const bool use_tag, + + MemArena *pf_arena) { BMLoop *l_iter, *l_first, *l_new; BMFace *f_new; @@ -854,7 +856,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, } BLI_polyfill_calc_arena((const float (*)[2])projverts, f->len, -1, tris, - sf_arena); + pf_arena); if (use_beauty) { edge_array = BLI_array_alloca(edge_array, orig_f_len - 3); diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index d62c81c4052..8c81b456b08 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -56,12 +56,13 @@ void BM_vert_normal_update_all(BMVert *v) ATTR_NONNULL(); void BM_face_normal_flip(BMesh *bm, BMFace *f) ATTR_NONNULL(); bool BM_face_point_inside_test(BMFace *f, const float co[3]) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void BM_face_triangulate(BMesh *bm, BMFace *f, - BMFace **r_faces_new, - int *r_faces_new_tot, - struct MemArena *sf_arena, - const int quad_method, const int ngon_method, - const bool use_tag) ATTR_NONNULL(1, 2); +void BM_face_triangulate( + BMesh *bm, BMFace *f, + BMFace **r_faces_new, + int *r_faces_new_tot, + const int quad_method, const int ngon_method, + const bool use_tag, + struct MemArena *pf_arena) ATTR_NONNULL(1, 2); void BM_face_splits_check_legal(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len) ATTR_NONNULL(); void BM_face_splits_check_optimal(BMFace *f, BMLoop *(*loops)[2], int len) ATTR_NONNULL(); |