diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-27 14:11:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-27 14:28:02 +0400 |
| commit | c3deb16c16f816848e2f1e411617e89ccbc98422 (patch) | |
| tree | 1c1b38fad12eea341b3fc6065e541ac3ae47512f /source/blender/bmesh/tools | |
| parent | 07a5caad5fad742196aa4df0e251aaf4f0568563 (diff) | |
BMesh: add ability not to delete vertex when collapsing
Diffstat (limited to 'source/blender/bmesh/tools')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 96af37f4400..99cb68c025a 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -237,7 +237,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, const float angle_limit, const bool if (LIKELY(v != NULL) && BM_vert_edge_count(v) == 2) { - BM_vert_collapse_edge(bm, v->e, v, true); /* join edges */ + BM_vert_collapse_edge(bm, v->e, v, true, true); /* join edges */ } } } @@ -275,7 +275,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, const float angle_limit, const bool i = BM_elem_index_get(v); if (BM_vert_edge_count(v) == 2) { - e_new = BM_vert_collapse_edge(bm, v->e, v, true); /* join edges */ + e_new = BM_vert_collapse_edge(bm, v->e, v, true, true); /* join edges */ if (e_new) { diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c index ffc680817a7..db60b3e15e1 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c @@ -119,7 +119,7 @@ static bool bm_vert_dissolve_fan(BMesh *bm, BMVert *v) if (tot_edge == 2) { /* check for 2 wire verts only */ if (tot_edge_wire == 2) { - return (BM_vert_collapse_edge(bm, v->e, v, true) != NULL); + return (BM_vert_collapse_edge(bm, v->e, v, true, true) != NULL); } } else if (tot_edge == 4) { |