Revision: 16456
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16456
Author: genscher
Date: 2008-09-10 13:38:19 +0200 (Wed, 10 Sep 2008)
Log Message:
-----------
Bugfix [#17592] Complex particle system 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-10 11:04:07 UTC (rev 16455)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2008-09-10 11:38:19 UTC (rev 16456)
@@ -3578,7 +3578,7 @@
pd= epart->pd;
totepart=
epsys->totpart;
-
if(pd->forcefield==PFIELD_FORCE && pd->f_strength<0.0){
+
if(pd->forcefield==PFIELD_FORCE && pd->f_strength<0.0 && ec->tree){
count=BLI_kdtree_find_n_nearest(ec->tree,epart->boidneighbours,pa->state.co,NULL,ptn2);
for(p=0;
p<count; p++){
state.time=-1.0;
@@ -3725,7 +3725,7 @@
pd= epart->pd;
totepart=
epsys->totpart;
-
if(pd->forcefield==PFIELD_FORCE && pd->f_strength>0.0){
+
if(pd->forcefield==PFIELD_FORCE && pd->f_strength>0.0 && ec->tree){
count=BLI_kdtree_find_n_nearest(ec->tree,epart->boidneighbours,pa->state.co,NULL,ptn2);
for(p=0;
p<count; p++){
state.time=-1.0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
