diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-08 18:57:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-09 15:08:28 +0300 |
| commit | a5c3de2e49ca348479b1f5915db9f7460422d07a (patch) | |
| tree | 0dbce9dcd08efa72be31078e8e18fdc41a10e64a /source/blender/bmesh/intern/bmesh_polygon.h | |
| parent | 6076bedec002b92e5f316a15a45a8cdaf686aa33 (diff) | |
Fix T42630: Triangulate returns invalid face-map
Triangulate with beautify caused a bug when there were existing edges
could make the bmesh-operator return an invalid face-map.
Now the beauty is calculated on the 2d-tri's resulting from polyfill,
its simpler and faster.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_polygon.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index 8c81b456b08..b25a7dbaa55 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -27,6 +27,9 @@ * \ingroup bmesh */ +struct EdgeHash; +struct Heap; + #include "BLI_compiler_attrs.h" void BM_bmesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptris_tot); @@ -62,7 +65,9 @@ void BM_face_triangulate( 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); + struct MemArena *pf_arena, + struct Heap *pf_heap, struct EdgeHash *pf_ehash + ) 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(); |