diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-16 03:59:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-16 03:59:02 +0400 |
| commit | 862dc635ed98c6d1ffc7c755058c682021da4c6b (patch) | |
| tree | 11de5533aaae2da3eab2ab63c5d5977aea73dbc4 /source/blender/modifiers/intern/MOD_smooth.c | |
| parent | d0b70cffaf99321c57045d8dc8ec197b1542395c (diff) | |
| parent | 0dbd9ea73f7f86e02d9aae6c65c3ce5e3c4ecd4b (diff) | |
svn merge ^/trunk/blender -r42617:42655
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smooth.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smooth.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index c878bf05a6a..a70ce3689a2 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -154,24 +154,19 @@ static void smoothModifier_do( } if (dvert) { - for (i = 0; i < numVerts; i++) { - MDeformWeight *dw = NULL; + MDeformVert *dv= dvert; + for (i = 0; i < numVerts; i++, dv++) { float f, fm, facw, *fp, *v; - int k; short flag = smd->flag; v = vertexCos[i]; fp = &ftmp[i*3]; - for (k = 0; k < dvert[i].totweight; ++k) { - if(dvert[i].dw[k].def_nr == defgrp_index) { - dw = &dvert[i].dw[k]; - break; - } - } - if (!dw) continue; - f = fac * dw->weight; + f= defvert_find_weight(dv, defgrp_index); + if (f <= 0.0f) continue; + + f *= fac; fm = 1.0f - f; /* fp is the sum of uctmp[i] verts, so must be averaged */ |