griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Dyntopo: compare masks when collapsing

Browse Source 
Was just checking the value of the first
This commit is contained in:
Campbell Barton
2016-07-05 16:21:58 +10:00
parent 020a420fe3
commit 8a648c1913
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -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;
}