[Bf-blender-cvs] [d5c41954a44] soc-2019-adaptive-cloth: Cloth: fix collapse edges working on vertex with upto 2 edges
ishbosamiya
noreply at git.blender.org
Thu Jul 4 12:47:00 CEST 2019
Commit: d5c41954a446eb25cd24549327b11e4e2e18134c
Author: ishbosamiya
Date: Tue Jul 2 18:07:35 2019 +0530
Branches: soc-2019-adaptive-cloth
https://developer.blender.org/rBd5c41954a446eb25cd24549327b11e4e2e18134c
Cloth: fix collapse edges working on vertex with upto 2 edges
===================================================================
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 a5e6838edf6..59008598677 100644
--- a/source/blender/blenkernel/intern/cloth_remeshing.cpp
+++ b/source/blender/blenkernel/intern/cloth_remeshing.cpp
@@ -802,9 +802,9 @@ static bool cloth_remeshing_can_collapse_edge(BMesh *bm, BMEdge *e, vector<Cloth
return true;
}
-static BMEdge *cloth_remeshing_collapse_edge(BMesh *bm, BMEdge *e)
+static BMVert *cloth_remeshing_collapse_edge(BMesh *bm, BMEdge *e)
{
- return BM_vert_collapse_faces(bm, e, e->v1, 1.0f, true, true, true);
+ return BM_edge_collapse(bm, e, e->v1, true, true);
}
static bool cloth_remeshing_try_edge_collapse(BMesh *bm, BMEdge *e, vector<ClothSizing> &sizing)
More information about the Bf-blender-cvs
mailing list