diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-26 02:15:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-26 02:15:59 +0300 |
| commit | 3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e (patch) | |
| tree | 66ffef104bffcd2490d929c9789fc2cbc11e73ad /source/blender/blenkernel/intern/effect.c | |
| parent | bda0456933e87c2f623a8e4f980bf7cfc6b3982a (diff) | |
| parent | 5c3216e2334863137019b55a44d5b9cfea842c10 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 668d4d6c9e2..c58e304db6c 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -848,6 +848,14 @@ static void do_physical_effector(EffectorCache *eff, EffectorData *efd, Effected break; case PFIELD_FORCE: normalize_v3(force); + if (pd->flag & PFIELD_GRAVITATION){ /* Option: Multiply by 1/distance^2 */ + if (efd->distance < FLT_EPSILON){ + strength = 0.0f; + } + else { + strength *= powf(efd->distance, -2.0f); + } + } mul_v3_fl(force, strength * efd->falloff); break; case PFIELD_VORTEX: |