Revision: 16416
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16416
Author: genscher
Date: 2008-09-07 22:46:54 +0200 (Sun, 07 Sep 2008)
Log Message:
-----------
Bugfix for #17572 Boids Particles Crash
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
2008-09-07 20:18:26 UTC (rev 16415)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2008-09-07 20:46:54 UTC (rev 16416)
@@ -2673,8 +2673,8 @@
if(falloff<=0.0f)
; /*
don't do anything */
else
-
do_physical_effector(eob, state->co, pd->forcefield,pd->f_strength,distance,
-
falloff,epart->size,pd->f_damp,estate.vel,vec_to_part,
+
do_physical_effector(eob, state->co, pd->forcefield,pd->f_strength,distance,
+
falloff,epart->size,pd->f_damp,estate.vel,vec_to_part,
state->vel,force_field,0, pd->rng, pd->f_noise,charge,pa->size);
}
}
@@ -3875,7 +3875,7 @@
state->vel[2]=0.0;
state->co[2]=part->groundz;
- if(psys->keyed_ob){
+ if(psys->keyed_ob && (psys->keyed_ob->type == OB_MESH)){
Object *zob=psys->keyed_ob;
int min_face;
float co1[3],co2[3],min_d=2.0,min_w[4],imat[4][4];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
