[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16487] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Bugfix [#17609] Complex particles crash II - related to #17592

[Daniel Genrich]

Revision: 16487
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16487
Author:   genscher
Date:     2008-09-12 15:15:52 +0200 (Fri, 12 Sep 2008)

Log Message:
-----------
Bugfix [#17609] Complex particles crash II - related to #17592

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-12 12:58:08 UTC (rev 16486)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-09-12 13:15:52 UTC (rev 16487)
@@ -2678,7 +2678,7 @@
 								state->vel,force_field,0, pd->rng, pd->f_noise,charge,pa->size);
 						}
 					}
-					else if(pd->forcefield==PFIELD_HARMONIC && cfra-framestep <= epa->dietime && cfra>epa->dietime){
+					else if(pd & pd->forcefield==PFIELD_HARMONIC && cfra-framestep <= epa->dietime && cfra>epa->dietime){
 						/* first step after key release */
 						psys_get_particle_state(eob,epsys,p,&estate,1);
 						VECADD(vel,vel,estate.vel);