diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-05-05 21:07:20 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-05-05 21:07:20 +0400 |
| commit | 2137e2ecec6a04770f8a91fae952ecd79ada2f91 (patch) | |
| tree | 6d600caca65c13ee2d94b0f8cd58e1664f06d162 | |
| parent | 53a2f11148a95bf9c3c36a6e567e80f243b758c1 (diff) | |
Fix for [#27294] Subframes cause dampened particles to behave differently
* The unphysical particle damping wasn't scaled according to the timestep.
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 666ba31faed..c2aa297b174 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2553,7 +2553,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa /* damp affects final velocity */ if(part->dampfac != 0.f) - mul_v3_fl(pa->state.vel, 1.f - part->dampfac * efdata.ptex.damp); + mul_v3_fl(pa->state.vel, 1.f - part->dampfac * efdata.ptex.damp * 25.f * dtime); //VECCOPY(pa->state.ave, states->ave); |