Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-01-20 01:44:25 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-01-20 01:44:57 +0300
commit81b7f8efaf7a0dfec7a17a11ff2f2c8af661bbd2 (patch)
tree42935b35fb5acca019cbe72bec5e2dbbe6000692 /source/blender/editors/interface/interface_templates.c
parentc7596cd820e32747372378a511cd95894c4829e3 (diff)
Fixed secondary particle combined export functionality
The combined export was using the old flag format.
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r--source/blender/editors/interface/interface_templates.c4
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 0880da91005..280ce4c0efa 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;
}
}