diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-06-05 08:26:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-05 08:26:37 +0300 |
commit | ffaf271ab904cc7220a3f858bab64c441c1fbdc0 (patch) | |
tree | 739cc7b4431f7b2e515bc2b02b2f55628392f4f5 /source/blender/modifiers | |
parent | aca40295e8ac868b6e3aec40bbcd388177508c1f (diff) |
BMesh: decimator, allow vgroup factor over 1
Can be useful to apply more extreme weighting
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 878015c7a7b..14468ab7c12 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -147,12 +147,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, if (dmd->flag & MOD_DECIM_FLAG_INVERT_VGROUP) { for (i = 0; i < vert_tot; i++) { - vweights[i] = (1.0f - defvert_find_weight(&dvert[i], defgrp_index)) * dmd->defgrp_factor; + vweights[i] = 1.0f - defvert_find_weight(&dvert[i], defgrp_index); } } else { for (i = 0; i < vert_tot; i++) { - vweights[i] = (defvert_find_weight(&dvert[i], defgrp_index)) * dmd->defgrp_factor; + vweights[i] = defvert_find_weight(&dvert[i], defgrp_index); } } } @@ -165,7 +165,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, case MOD_DECIM_MODE_COLLAPSE: { const bool do_triangulate = (dmd->flag & MOD_DECIM_FLAG_TRIANGULATE) != 0; - BM_mesh_decimate_collapse(bm, dmd->percent, vweights, do_triangulate); + BM_mesh_decimate_collapse(bm, dmd->percent, vweights, dmd->defgrp_factor, do_triangulate); break; } case MOD_DECIM_MODE_UNSUBDIV: |