archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-06-02 13:09:12 +02:00
parent bb8770b976 c140f11946
commit a08a8aa928
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/particle_system.c
View File

@@ -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);