[Bf-blender-cvs] [6e94ec6] master: BMesh: limited-dissolve, add check for wire edges

Campbell Barton noreply at git.blender.org
Thu Apr 28 04:47:21 CEST 2016


Commit: 6e94ec623d3ff9e92cffc3e1461f033543dda5b3
Author: Campbell Barton
Date:   Thu Apr 28 12:48:13 2016 +1000
Branches: master
https://developer.blender.org/rB6e94ec623d3ff9e92cffc3e1461f033543dda5b3

BMesh: limited-dissolve, add check for wire edges

Recent degenerate check crashed on chains of wire edges

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

M	source/blender/bmesh/tools/bmesh_decimate_dissolve.c

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

diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
index 5a7a2f3..1a16bd1 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
@@ -226,6 +226,12 @@ static bool  bm_vert_collapse_is_degenerate(BMVert *v)
 	BMVert *v_pair[2];
 
 	if (BM_vert_edge_pair(v, &e_pair[0], &e_pair[1])) {
+
+		/* allow wire edges */
+		if (BM_edge_is_wire(e_pair[0]) || BM_edge_is_wire(e_pair[1])) {
+			return false;
+		}
+
 		v_pair[0] = BM_edge_other_vert(e_pair[0], v);
 		v_pair[1] = BM_edge_other_vert(e_pair[1], v);




More information about the Bf-blender-cvs mailing list