From 8a648c191305e79a2160c170a9f481c22ddab007 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 5 Jul 2016 16:21:58 +1000 Subject: Dyntopo: compare masks when collapsing Was just checking the value of the first --- source/blender/blenkernel/intern/pbvh_bmesh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index d936b4e2dae..861fbeef87c 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1106,10 +1106,11 @@ static void pbvh_bmesh_collapse_edge( EdgeQueueContext *eq_ctx) { BMVert *v_del, *v_conn; - float mask_v1 = BM_ELEM_CD_GET_FLOAT(v1, eq_ctx->cd_vert_mask_offset); /* one of the two vertices may be masked, select the correct one for deletion */ - if (mask_v1 < 1.0f) { + if (BM_ELEM_CD_GET_FLOAT(v1, eq_ctx->cd_vert_mask_offset) < + BM_ELEM_CD_GET_FLOAT(v2, eq_ctx->cd_vert_mask_offset)) + { v_del = v1; v_conn = v2; } -- cgit v1.2.3