sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

mask modifier was taking into account zero weighted verts.

Browse Source
This commit is contained in:
Campbell Barton 2011-06-14 01:54:03 +00:00
parent e6b0a77956
commit dd3b729d62
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/modifiers/intern/MOD_mask.c
View File

@ -202,7 +202,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if (BLI_ghash_haskey(boneHash, SET_INT_IN_POINTER(dvert[i].dw[j].def_nr))) if (BLI_ghash_haskey(boneHash, SET_INT_IN_POINTER(dvert[i].dw[j].def_nr)))
{ {
def_weight = &dvert[i].dw[j]; def_weight = &dvert[i].dw[j];
break; if(def_weight->weight != 0.0f) {
break;
}
} }
} }
@ -243,26 +245,16 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
/* add vertices which exist in vertexgroup into ghash for filtering */ /* add vertices which exist in vertexgroup into ghash for filtering */
for (i = 0; i < maxVerts; i++) for (i = 0; i < maxVerts; i++)
{ {
MDeformWeight *def_weight = NULL; const int weight_set= defvert_find_weight(dvert + i, defgrp_index) != 0.0f;
int j;
for (j= 0; j < dvert[i].totweight; j++)
{
if (dvert[i].dw[j].def_nr == defgrp_index)
{
def_weight = &dvert[i].dw[j];
break;
}
}
/* check if include vert in vertHash */ /* check if include vert in vertHash */
if (mmd->flag & MOD_MASK_INV) { if (mmd->flag & MOD_MASK_INV) {
/* if this vert is in the vgroup, don't include it in vertHash */ /* if this vert is in the vgroup, don't include it in vertHash */
if (def_weight) continue; if (weight_set) continue;
} }
else { else {
/* if this vert isn't in the vgroup, don't include it in vertHash */ /* if this vert isn't in the vgroup, don't include it in vertHash */
if (!def_weight) continue; if (!weight_set) continue;
} }
/* add to ghash for verts (numVerts acts as counter for mapping) */ /* add to ghash for verts (numVerts acts as counter for mapping) */