blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Modifiers: Explode modifier add invert vgroup option 

Adds the invert vgroup option to the Explode modifier.

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D6844
This commit is contained in:
Cody Winchester 2020-02-18 17:03:20 +01:00 committed by Bastien Montagne
parent b8567b704b
commit 5df0f8bffb
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,7 +423,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label(text="Vertex Group:")
col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row = col.row(align=True)
row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
sub = col.column()
sub.active = bool(md.vertex_group)
sub.prop(md, "protect")

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

@ -977,6 +977,7 @@ typedef enum {
eExplodeFlag_Unborn = (1 << 3),
eExplodeFlag_Alive = (1 << 4),
eExplodeFlag_Dead = (1 << 5),
eExplodeFlag_INVERT_VGROUP = (1 << 6),
} ExplodeModifierFlag;
typedef struct ExplodeModifierData {

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

@ -3600,6 +3600,11 @@ static void rna_def_modifier_explode(BlenderRNA *brna)
RNA_def_property_string_maxlength(prop, MAX_CUSTOMDATA_LAYER_NAME);
RNA_def_property_ui_text(prop, "Particle UV", "UV map to change with particle age");
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", eExplodeFlag_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_cloth(BlenderRNA *brna)

5
source/blender/modifiers/intern/MOD_explode.c
View File

@ -97,6 +97,7 @@ static void createFacepa(ExplodeModifierData *emd, ParticleSystemModifierData *p
float center[3], co[3];
int *facepa = NULL, *vertpa = NULL, totvert = 0, totface = 0, totpart = 0;
int i, p, v1, v2, v3, v4 = 0;
const bool invert_vgroup = (emd->flag & eExplodeFlag_INVERT_VGROUP) != 0;
mvert = mesh->mvert;
mface = mesh->mface;
@ -129,7 +130,9 @@ static void createFacepa(ExplodeModifierData *emd, ParticleSystemModifierData *p
for (i = 0; i < totvert; i++, dvert++) {
float val = BLI_rng_get_float(rng);
val = (1.0f - emd->protect) * val + emd->protect * 0.5f;
if (val < defvert_find_weight(dvert, defgrp_index)) {
const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert, defgrp_index) :
defvert_find_weight(dvert, defgrp_index);
if (val < weight) {
vertpa[i] = -1;
}
}