diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 11:22:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 11:22:44 +0300 |
| commit | fb26d25405319191eed286a0f9bdd58b899c6009 (patch) | |
| tree | 1b3e234257eaaf9ada8838dff39ce87ddb83cfe3 /source/blender/editors/interface/interface_templates.c | |
| parent | 3fb8191d1dbd5c50c8bd5b0821e7cf1bb9885736 (diff) | |
| parent | 6395937b01f0f6ca8669d694edcf9e7d258a30a1 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 4fcc8ba4112..c43b7385a36 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1822,7 +1822,9 @@ static int modifier_can_delete(ModifierData *md) short particle_type = ((ParticleSystemModifierData *)md)->psys->part->type; if (particle_type == PART_FLUID || particle_type == PART_FLUID_FLIP || particle_type == PART_FLUID_FOAM || particle_type == PART_FLUID_SPRAY || - particle_type == PART_FLUID_BUBBLE || particle_type == PART_FLUID_TRACER) { + particle_type == PART_FLUID_BUBBLE || particle_type == PART_FLUID_TRACER || + particle_type == PART_FLUID_SPRAYFOAM || particle_type == PART_FLUID_SPRAYBUBBLE || + particle_type == PART_FLUID_FOAMBUBBLE || particle_type == PART_FLUID_SPRAYFOAMBUBBLE) { return 0; } } |