diff options
| -rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 5ae971bce6f..35a7f556214 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -291,6 +291,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col.prop(md, "unborn") col.prop(md, "alive") col.prop(md, "dead") + col.prop(md, "size") layout.operator("object.explode_refresh", text="Refresh") diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 76e49c0726b..51e4ae37cd9 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -8637,7 +8637,8 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd, /* apply rotation, size & location */ mul_qt_v3(state.rot,vertco); - mul_v3_fl(vertco,pa->size); + if(emd->flag & eExplodeFlag_PaSize) + mul_v3_fl(vertco,pa->size); VECADD(vertco,vertco,state.co); mul_m4_v3(imat,vertco); diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index a9178a392f4..a52c1f83433 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -571,7 +571,7 @@ typedef struct ParticleInstanceModifierData { typedef enum { eExplodeFlag_CalcFaces = (1<<0), - //eExplodeFlag_PaSize = (1<<1), + eExplodeFlag_PaSize = (1<<1), eExplodeFlag_EdgeSplit = (1<<2), eExplodeFlag_Unborn = (1<<3), eExplodeFlag_Alive = (1<<4), diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d4bc2d6c571..1c21f95bf5c 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1676,6 +1676,11 @@ static void rna_def_modifier_explode(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Dead); RNA_def_property_ui_text(prop, "Dead", "Show mesh when particles are dead"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); + + prop= RNA_def_property(srna, "size", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_PaSize); + RNA_def_property_ui_text(prop, "Size", "Use particle size for the shrapnel"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); } static void rna_def_modifier_cloth(BlenderRNA *brna) |