Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-11-27 21:17:02 +0300
committerTon Roosendaal <ton@blender.org>2005-11-27 21:17:02 +0300
commitdff7bebab8630f87b8b38995bdcbb8a9a191ea4b (patch)
treea859a52aa8b5ab199350f5f2b3269359d2012c04 /source/blender
parentcb82936a983b09842dd51136014a41b5ae677b78 (diff)
Bugfix #3478
Using a Curve object as a forcefield (not as Guide) crashed Blender. Needed an additional check in code.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/effect.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 6ebee741826..b2b52cfda06 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -391,9 +391,11 @@ static void precalc_effectors(Object *ob, PartEff *paf, Particle *pa, ListBase *
pEffectorCache *ec;
for(ec= lb->first; ec; ec= ec->next) {
+ PartDeflect *pd= ec->ob->pd;
+
ec->oldspeed[0]= ec->oldspeed[1]= ec->oldspeed[2]= 0.0f;
- if(ec->ob->type==OB_CURVE) {
+ if(pd->forcefield==PFIELD_GUIDE && ec->ob->type==OB_CURVE) {
float vec[4], dir[3];
/* scale corrects speed vector to curve size */