archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modifiers: Weld Modifier add invert vgroup option

Browse Source 
Adds the invert vgroup option to the weld modifier.

Differential Revision: https://developer.blender.org/D6818
This commit is contained in:
Cody Winchester
2020-02-12 11:04:20 +01:00
committed by Bastien Montagne
parent 0e15850a7e
commit cd57c9e310
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -1498,7 +1498,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
def WELD(self, layout, ob, md): def WELD(self, layout, ob, md):
layout.prop(md, "merge_threshold", text="Distance") layout.prop(md, "merge_threshold", text="Distance")
layout.prop(md, "max_interactions") layout.prop(md, "max_interactions")
layout.prop_search(md, "vertex_group", ob, "vertex_groups") row = layout.row(align=True)
row.prop_search(md, "vertex_group", ob, "vertex_groups")
row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
def DATA_TRANSFER(self, layout, ob, md): def DATA_TRANSFER(self, layout, ob, md):
row = layout.row(align=True) row = layout.row(align=True)

8
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -1862,8 +1862,16 @@ typedef struct WeldModifierData {
unsigned int max_interactions; unsigned int max_interactions;
/* Name of vertex group to use to mask, MAX_VGROUP_NAME. */ /* Name of vertex group to use to mask, MAX_VGROUP_NAME. */
char defgrp_name[64]; char defgrp_name[64];
short flag;
char _pad[6];
} WeldModifierData; } WeldModifierData;
/* WeldModifierData->flag */
enum {
MOD_WELD_INVERT_VGROUP = (1 << 0),
};
typedef struct DataTransferModifierData { typedef struct DataTransferModifierData {
ModifierData modifier; ModifierData modifier;

5
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -5717,6 +5717,11 @@ static void rna_def_modifier_weld(BlenderRNA *brna)
prop, "Vertex Group", "Vertex group name for selecting the affected areas"); prop, "Vertex Group", "Vertex group name for selecting the affected areas");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeldModifier_defgrp_name_set"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeldModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update"); 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_WELD_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_datatransfer(BlenderRNA *brna) static void rna_def_modifier_datatransfer(BlenderRNA *brna)

4
source/blender/modifiers/intern/MOD_weld.c
View File

@@ -1623,6 +1623,7 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
const MPoly *mpoly, *mp; const MPoly *mpoly, *mp;
uint totvert, totedge, totloop, totpoly; uint totvert, totedge, totloop, totpoly;
uint i; uint i;
const bool invert_vgroup = (wmd->flag & MOD_WELD_INVERT_VGROUP) != 0;
mvert = mesh->mvert; mvert = mesh->mvert;
totvert = mesh->totvert; totvert = mesh->totvert;
@@ -1636,7 +1637,8 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
dv = &dvert[0]; dv = &dvert[0];
v_mask = BLI_BITMAP_NEW(totvert, __func__); v_mask = BLI_BITMAP_NEW(totvert, __func__);
for (i = 0; i < totvert; i++, dv++) { for (i = 0; i < totvert; i++, dv++) {
const bool found = defvert_find_weight(dv, defgrp_index) > 0.0f; const bool found = invert_vgroup ? 1.0f - defvert_find_weight(dv, defgrp_index) > 0.0f :
defvert_find_weight(dv, defgrp_index) > 0.0f;
if (found) { if (found) {
BLI_BITMAP_ENABLE(v_mask, i); BLI_BITMAP_ENABLE(v_mask, i);
v_mask_act++; v_mask_act++;