[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57064] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: fix [#35544] Boids Segfault of frame advance using cursor keys
Campbell Barton
ideasman42 at gmail.com
Tue May 28 00:25:54 CEST 2013
Revision: 57064
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57064
Author: campbellbarton
Date: 2013-05-27 22:25:54 +0000 (Mon, 27 May 2013)
Log Message:
-----------
fix [#35544] Boids Segfault of frame advance using cursor keys
caused by partial revert of r56073.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56073
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 2013-05-27 20:56:33 UTC (rev 57063)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2013-05-27 22:25:54 UTC (rev 57064)
@@ -4130,6 +4130,7 @@
{
ParticleSystem *psys = sim->psys;
ParticleSettings *part=psys->part;
+ RNG *rng;
BoidBrainData bbd;
ParticleTexture ptex;
PARTICLE_P;
@@ -4157,6 +4158,8 @@
}
BLI_srandom(31415926 + (int)cfra + psys->seed);
+ /* for now do both, boids us 'rng' */
+ rng = BLI_rng_new_srandom(31415926 + (int)cfra + psys->seed);
psys_update_effectors(sim);
@@ -4173,6 +4176,7 @@
bbd.cfra = cfra;
bbd.dfra = dfra;
bbd.timestep = timestep;
+ bbd.rng = rng;
psys_update_particle_tree(psys, cfra);
@@ -4356,6 +4360,7 @@
}
free_collider_cache(&sim->colliders);
+ BLI_rng_free(rng);
}
static void update_children(ParticleSimulationData *sim)
{
More information about the Bf-blender-cvs
mailing list