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>2019-12-17 13:39:23 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2019-12-17 13:39:23 +0300
commitbda4a284d20164fec2433f7c40f49fc903319400 (patch)
treea30de806282458376a5beffa8d474af2debf9ff4 /source/blender/makesrna/intern/rna_particle.c
parent4b62d989847b821f35443eb3704a5b8e78a5e3c2 (diff)
Fluid: Fix particle settings type
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
-rw-r--r--source/blender/makesrna/intern/rna_particle.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 51df843947d..b65ef1bdda2 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -954,8 +954,12 @@ static int rna_PartSettings_is_fluid_get(PointerRNA *ptr)
{
ParticleSettings *part = (ParticleSettings *)ptr->data;
- return (part->type & (PART_FLUID_FLIP | PART_FLUID_SPRAY | PART_FLUID_BUBBLE | PART_FLUID_FOAM |
- PART_FLUID_TRACER));
+ if (part->type == PART_FLUID || part->type == PART_FLUID_FLIP || part->type == PART_FLUID_FOAM ||
+ part->type == PART_FLUID_SPRAY || part->type == PART_FLUID_BUBBLE ||
+ part->type == PART_FLUID_TRACER) {
+ return true;
+ }
+ return false;
}
static void rna_ParticleSettings_use_clump_curve_update(Main *bmain, Scene *scene, PointerRNA *ptr)