BMesh Decimate: don't collapse zero weighted edges

2015-12-03 00:18:59 +11:00 · 2015-12-03 00:18:59 +11:00 · 9bcd604e1d
parent 227fb30a18
commit 9bcd604e1d
1 changed files with 7 additions and 0 deletions
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@ -242,6 +242,13 @@ static void bm_decim_build_edge_cost_single(
 		BLI_heap_remove(eheap, eheap_table[BM_elem_index_get(e)]);
 	}

+	if (UNLIKELY(vweights &&
+	             ((vweights[BM_elem_index_get(e->v1)] == 0.0f) ||
+	              (vweights[BM_elem_index_get(e->v2)] == 0.0f))))
+	{
+		goto clear;
+	}
+
 	/* check we can collapse, some edges we better not touch */
 	if (BM_edge_is_boundary(e)) {
 		if (e->l->f->len == 3) {