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/intern/bmesh_core.c | |
| parent | 07a5caad5fad742196aa4df0e251aaf4f0568563 (diff) | |
BMesh: add ability not to delete vertex when collapsing
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_core.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 812c223dcc4..c4dc9909185 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1657,7 +1657,8 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e) * faces with just 2 edges. It is up to the caller to decide what to do with * these faces. */ -BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool check_edge_double) +BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, + const bool do_del, const bool check_edge_double) { BMEdge *e_old; BMVert *v_old, *tv; @@ -1668,6 +1669,8 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool check_e bool edok; #endif + BLI_assert(BM_vert_in_edge(e_kill, v_kill)); + if (BM_vert_in_edge(e_kill, v_kill) == 0) { return NULL; } @@ -1759,7 +1762,12 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool check_e bm_kill_only_edge(bm, e_kill); /* deallocate vertex */ - bm_kill_only_vert(bm, v_kill); + if (do_del) { + bm_kill_only_vert(bm, v_kill); + } + else { + v_kill->e = NULL; + } #ifndef NDEBUG /* Validate disk cycle lengths of v_old, tv are unchanged */ |