diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 08:38:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 08:38:37 +0400 |
| commit | a631b5a651802311b1873f2291b1b192deecfae9 (patch) | |
| tree | 836238e33930d534afa037f2c88362792eed939a /source/blender/bmesh/intern/bmesh_structure.h | |
| parent | ebeb8155777269ea70f5c0c9de898bdd01d87715 (diff) | |
fix for a bug in bmesh_jekv (and its main caller BM_vert_collapse_faces).
Collapsing an edge could result on 2 edges sharing the same verts, now check for this and 'splice' one edge into another.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_structure.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_structure.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.h index 1c00183e03a..a569c98d16d 100644 --- a/source/blender/bmesh/intern/bmesh_structure.h +++ b/source/blender/bmesh/intern/bmesh_structure.h @@ -90,7 +90,8 @@ struct BMFace *bmesh_sfme(struct BMesh *bm, struct BMFace *f, struct BMVert *v1, #endif BMEdge *example ); -int bmesh_jekv(struct BMesh *bm, struct BMEdge *ke, struct BMVert *kv); + +struct BMEdge *bmesh_jekv(struct BMesh *bm, struct BMEdge *ke, struct BMVert *kv, const short check_edge_splice); int bmesh_loop_reverse(struct BMesh *bm, struct BMFace *f); struct BMFace *bmesh_jfke(struct BMesh *bm, struct BMFace *f1, struct BMFace *f2, struct BMEdge *e); |