From 2137e2ecec6a04770f8a91fae952ecd79ada2f91 Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Thu, 5 May 2011 17:07:20 +0000 Subject: [PATCH] Fix for [#27294] Subframes cause dampened particles to behave differently * The unphysical particle damping wasn't scaled according to the timestep. --- source/blender/blenkernel/intern/particle_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);