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_mods.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_mods.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h index 70b79d6b6e3..db418a26341 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.h @@ -33,14 +33,14 @@ int BM_vert_dissolve(BMesh *bm, BMVert *v); int BM_disk_dissolve(BMesh *bm, BMVert *v); -BMFace *BM_faces_join_pair(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e, - const short do_del); +BMFace *BM_faces_join_pair(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e); BMEdge *BM_verts_connect(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **r_f); BMFace *BM_face_split(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, - BMLoop **r_l, BMEdge *example); + BMLoop **r_l, + BMEdge *example, const short nodouble); BMFace *BM_face_split_n(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, |