diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-05 17:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-05 17:13:23 +0300 |
commit | 0f769afe07f96efa7ec6325453c4f04ea391f112 (patch) | |
tree | 25fc5257e3d52322334b05ff8d31d5b32f2cb16f /source/blender/bmesh/operators/bmo_connect_concave.c | |
parent | cb39a4171b6a052f13625688cbb5aed267356b50 (diff) |
Fix T46692: Triangulate creates duplicate faces
Caused a crash in dyntopo.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_connect_concave.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect_concave.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c index 107aead6994..34f59aad4f1 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.c +++ b/source/blender/bmesh/operators/bmo_connect_concave.c @@ -42,6 +42,7 @@ #include "BLI_polyfill2d.h" #include "BLI_polyfill2d_beautify.h" #include "BLI_edgehash.h" +#include "BLI_linklist.h" #include "bmesh.h" @@ -84,6 +85,7 @@ static bool bm_face_split_by_concave( BMFace **faces_array = BLI_array_alloca(faces_array, faces_array_tot); BMEdge **edges_array = BLI_array_alloca(edges_array, edges_array_tot); const int quad_method = 0, ngon_method = 0; /* beauty */ + LinkNode *r_faces_double = NULL; float normal[3]; BLI_assert(f_base->len > 3); @@ -94,6 +96,7 @@ static bool bm_face_split_by_concave( bm, f_base, faces_array, &faces_array_tot, edges_array, &edges_array_tot, + &r_faces_double, quad_method, ngon_method, false, pf_arena, pf_heap, pf_ehash); |