[Bf-blender-cvs] [320013cf292] soc-2019-adaptive-cloth: Cloth: fix collapse edge, seam issue

[ishbosamiya]

Commit: 320013cf292eb861412390afe20a544e13508105
Author: ishbosamiya
Date:   Tue Jul 9 20:50:50 2019 +0530
Branches: soc-2019-adaptive-cloth
https://developer.blender.org/rB320013cf292eb861412390afe20a544e13508105

Cloth: fix collapse edge, seam issue

The edges on the seam should also be allowed to collapse.

===================================================================

M	source/blender/blenkernel/intern/cloth_remeshing.cpp

===================================================================

diff --git a/source/blender/blenkernel/intern/cloth_remeshing.cpp b/source/blender/blenkernel/intern/cloth_remeshing.cpp
index 15a17f11838..58e146cc1ed 100644
--- a/source/blender/blenkernel/intern/cloth_remeshing.cpp
+++ b/source/blender/blenkernel/intern/cloth_remeshing.cpp
@@ -999,7 +999,7 @@ static bool cloth_remeshing_vert_on_seam_test(BMesh *bm, BMVert *v)
 
 static BMVert *cloth_remeshing_collapse_edge(Cloth *cloth, BMesh *bm, BMEdge *e)
 {
-  if (cloth_remeshing_vert_on_seam_test(bm, e->v1)) {
+  if (cloth_remeshing_vert_on_seam_test(bm, e->v1) && !cloth_remeshing_edge_on_seam_test(bm, e)) {
 #if 0
     printf("didn't collapse edge due to vert on seam: %f, %f, %f\n",
            e->v1->co[0],