diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 23:29:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 23:29:05 +0400 |
commit | d1937de1d26992c31407485c7945470627234ebb (patch) | |
tree | c57f8739cf6b764987cde7c6e14cb1b81b57faf9 /source/blender/bmesh/intern/bmesh_core.h | |
parent | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (diff) |
fix for own error in edge-rotate keeping edge customdata - this was crashing when rotating multiple edges.
Now create the rotate edge in advance and copy its customdata (before joining the faces).
This commit also fixes an annoyance where tryangulating faces could create duplicate edges.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_core.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.h b/source/blender/bmesh/intern/bmesh_core.h index eadb588f859..f1ff506e590 100644 --- a/source/blender/bmesh/intern/bmesh_core.h +++ b/source/blender/bmesh/intern/bmesh_core.h @@ -44,8 +44,7 @@ int BM_edge_splice(BMesh *bm, BMEdge *e, BMEdge *etarget); int bmesh_loop_reverse(BMesh *bm, BMFace *f); -BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, - const short do_del); +BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface); /* EULER API - For modifying structure */ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, @@ -53,7 +52,8 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, #ifdef USE_BMESH_HOLES ListBase *holes, #endif - BMEdge *example + BMEdge *example, + const short nodouble ); BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e); |