Revision: 33844
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33844
Author: jhk
Date: 2010-12-22 10:30:13 +0100 (Wed, 22 Dec 2010)
Log Message:
-----------
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!
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c
2010-12-22 02:28:06 UTC (rev 33843)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2010-12-22 09:30:13 UTC (rev 33844)
@@ -3663,9 +3663,8 @@
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 @@
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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
