diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 18:58:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 18:58:07 +0300 |
commit | 84becb870f8e0785bdfca0f381c7b06f415e4e6a (patch) | |
tree | ce3938c0947b73a8517b8c694058e11b75b790b3 /source/blender/blenkernel/BKE_particle.h | |
parent | 2b4d2de2537ef1c7cfc66c261067d477f5f94edc (diff) | |
parent | 747534af0058ff7a719b99af68333753527ed747 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 4820f0173bf..d9a5cbab16e 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -312,6 +312,7 @@ bool psys_check_edited(struct ParticleSystem *psys); void psys_check_group_weights(struct ParticleSettings *part); int psys_uses_gravity(struct ParticleSimulationData *sim); +void BKE_particlesettings_fluid_default_settings(struct ParticleSettings *part); /* free */ void BKE_particlesettings_free(struct ParticleSettings *part); |