diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-12-02 04:49:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-02 04:49:18 +0400 |
commit | c33fb00c287a05424bd7f99051ab02fa322aeb02 (patch) | |
tree | a60de665c97d844fd2f396f3f8c06b3caeaa18f9 /source/blender/bmesh/intern/bmesh_polygon.h | |
parent | a10cf5c99e339a81bfd151f22490b2541e2751aa (diff) |
Fix for triangulate and beauty-fill
- could crash if triangulate attempted to create an existing face.
- tagging edges to rotate was unreliable, don't do this anymore.
now check if edge is in the array passed to the beauty function.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_polygon.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index f6203509be6..f408947f467 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -54,7 +54,9 @@ 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 **newfaces, +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); |