diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-22 12:30:13 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-22 12:30:13 +0300 |
| commit | 9d756fb761ba24a884e9663b779b8807adcdb805 (patch) | |
| tree | fcd46724f8212d4d1dff46147f8279da54404d7b | |
| parent | 2dc2f50a6e8ac9bb0278c3620ec3d0e6fe19747f (diff) | |
Fix for [#25339] Rendering Fluid's Float Particals cause crash when utilizng raytracing
* Fluidsim particles hadn't really been working at all for who knows how long, even in viewport!
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index aca8bf848a2..1f36f0845a2 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3663,9 +3663,8 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) part->sta=part->end = 1.0f; part->lifetime = sim->scene->r.efra + 1; - /* initialize particles */ + /* allocate particles */ realloc_particles(sim, part->totpart); - initialize_all_particles(sim); // set up reading mask readMask = fss->typeFlags; @@ -3697,6 +3696,9 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) pa->state.rot[0] = 1.0; pa->state.rot[1] = pa->state.rot[2] = pa->state.rot[3] = 0.0; + pa->time = 1.f; + pa->dietime = sim->scene->r.efra + 1; + pa->lifetime = sim->scene->r.efra; pa->alive = PARS_ALIVE; //if(a<25) fprintf(stderr,"FSPARTICLE debug set %s , a%d = %f,%f,%f , life=%f \n", filename, a, pa->co[0],pa->co[1],pa->co[2], pa->lifetime ); } else { |