diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-02 14:09:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-02 14:09:12 +0300 |
| commit | a08a8aa92895fbf12899b2f19508fcd9cb752277 (patch) | |
| tree | e35f56dd0e96bf367d80b040fb291f515b7d4086 | |
| parent | bb8770b97648fc655b5de0aacb6ea6f816e9e26c (diff) | |
| parent | c140f11946fd920230096950e4a1f18269f1b22e (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2fccd870672..88fc8c6a440 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3807,8 +3807,9 @@ static void cached_step(ParticleSimulationData *sim, float cfra, const bool use_ } } -static void particles_fluid_step(Main *bmain, ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) -{ +static void particles_fluid_step( + Main *bmain, ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) +{ ParticleSystem *psys = sim->psys; if (psys->particles) { MEM_freeN(psys->particles); |