diff options
author | Cody Winchester <CodyWinch> | 2020-02-18 18:28:02 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-18 18:28:02 +0300 |
commit | d0cc9b522dfb56e329f894d2c188bdcdfd175609 (patch) | |
tree | 6450f90a7936c92b940b572f99fbb282b7744e1a /source/blender | |
parent | cef4d344f948ce75a7787ad0c3915c87e1716ca1 (diff) |
Modifiers: Laplacian Smooth modifier add invert vgroup option
Adds the invert vgroup option to the Laplacian Smooth modifier.
Differential Revision: https://developer.blender.org/D6842
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciansmooth.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 2c19d4655d7..98ffe7ef416 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1683,6 +1683,7 @@ enum { MOD_LAPLACIANSMOOTH_Z = (1 << 3), MOD_LAPLACIANSMOOTH_PRESERVE_VOLUME = (1 << 4), MOD_LAPLACIANSMOOTH_NORMALIZED = (1 << 5), + MOD_LAPLACIANSMOOTH_INVERT_VGROUP = (1 << 6), }; typedef struct CorrectiveSmoothDeltaCache { diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 654cb5f99fc..9d5c07ef0f0 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -3212,6 +3212,11 @@ static void rna_def_modifier_laplaciansmooth(BlenderRNA *brna) "Name of Vertex Group which determines influence of modifier per point"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_LaplacianSmoothModifier_defgrp_name_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); + + prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_INVERT_VGROUP); + RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); } static void rna_def_modifier_cast(BlenderRNA *brna) diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index dbe776ed32a..ea788d3f72b 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -378,6 +378,7 @@ static void laplaciansmoothModifier_do( float w, wpaint; int i, iter; int defgrp_index; + const bool invert_vgroup = (smd->flag & MOD_LAPLACIANSMOOTH_INVERT_VGROUP) != 0; sys = init_laplacian_system(mesh->totedge, mesh->totpoly, mesh->totloop, numVerts); if (!sys) { @@ -420,7 +421,8 @@ static void laplaciansmoothModifier_do( EIG_linear_solver_right_hand_side_add(sys->context, 2, i, vertexCos[i][2]); if (iter == 0) { if (dv) { - wpaint = defvert_find_weight(dv, defgrp_index); + wpaint = invert_vgroup ? 1.0f - defvert_find_weight(dv, defgrp_index) : + defvert_find_weight(dv, defgrp_index); dv++; } else { |