diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-10-18 21:17:28 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-10-18 21:35:02 +0300 |
commit | 1f046e05b63c58bf3fd131f3765e7cc82dac85fb (patch) | |
tree | f49e78c1619bb726e8dd18d07a62bdabefcc03a5 /source | |
parent | bdad412fa76e6f4035f0a49c0b224de659ebbc25 (diff) |
Fluid: Add versioning for fluid particle physics type
Setting this type is required to prevent fluid particles from being treated like physics particles. The actual fix for this was made in rB11a8a6d0e6b5.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_290.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 453c6aa797c..5e6fdad8509 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -38,6 +38,7 @@ #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" #include "DNA_rigidbody_types.h" #include "DNA_screen_types.h" @@ -854,6 +855,13 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /* Ensure that particle systems generated by fluid modifier have correct phystype. */ + LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) { + if ELEM (part->type, PART_FLUID_FLIP, PART_FLUID_SPRAY, PART_FLUID_BUBBLE, PART_FLUID_FOAM) { + part->phystype = PART_PHYS_NO; + } + } } /** |