[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23927] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Changing particle physics type to boids and not boids multiple times crashed .
Janne Karhu
jhkarh at utu.fi
Sun Oct 18 22:52:15 CEST 2009
Revision: 23927
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23927
Author: jhk
Date: 2009-10-18 22:52:15 +0200 (Sun, 18 Oct 2009)
Log Message:
-----------
Changing particle physics type to boids and not boids multiple times crashed.
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 2009-10-18 19:48:33 UTC (rev 23926)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2009-10-18 20:52:15 UTC (rev 23927)
@@ -3504,8 +3504,6 @@
if(part->phystype == PART_PHYS_BOIDS && part->boids == NULL) {
BoidState *state;
- psys_check_boid_data(sim->psys);
-
part->boids = MEM_callocN(sizeof(BoidSettings), "Boid Settings");
boid_default_settings(part->boids);
@@ -3518,6 +3516,8 @@
state->flag |= BOIDSTATE_CURRENT;
BLI_addtail(&part->boids->states, state);
}
+
+ psys_check_boid_data(sim->psys);
}
static void particles_fluid_step(ParticleSimulationData *sim, int cfra)
{
More information about the Bf-blender-cvs
mailing list