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/makesrna/intern/rna_particle.c | |
| parent | 3fb8191d1dbd5c50c8bd5b0821e7cf1bb9885736 (diff) | |
| parent | 6395937b01f0f6ca8669d694edcf9e7d258a30a1 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 9bc65de11e0..d914dc3b8dd 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -964,7 +964,11 @@ static int rna_PartSettings_is_fluid_get(PointerRNA *ptr) PART_FLUID_FOAM, PART_FLUID_SPRAY, PART_FLUID_BUBBLE, - PART_FLUID_TRACER)); + PART_FLUID_TRACER, + PART_FLUID_SPRAYFOAM, + PART_FLUID_SPRAYBUBBLE, + PART_FLUID_FOAMBUBBLE, + PART_FLUID_SPRAYFOAMBUBBLE)); } static void rna_ParticleSettings_use_clump_curve_update(Main *bmain, Scene *scene, PointerRNA *ptr) |