diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-05 09:21:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-05 11:56:21 +0300 |
| commit | 8a648c191305e79a2160c170a9f481c22ddab007 (patch) | |
| tree | e5a90b820e0d0701ddae21681042dedaf0661312 /source/blender/blenkernel/intern/pbvh_bmesh.c | |
| parent | 020a420fe35e1b5b513780927b7f20107413e7c3 (diff) | |
Dyntopo: compare masks when collapsing
Was just checking the value of the first
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh_bmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |