Fix for [#27294] Subframes cause dampened particles to behave differently
authorJanne Karhu <jhkarh@gmail.com>
Thu, 5 May 2011 17:07:20 +0000 (17:07 +0000)
committerJanne Karhu <jhkarh@gmail.com>
Thu, 5 May 2011 17:07:20 +0000 (17:07 +0000)
* The unphysical particle damping wasn't scaled according to the timestep.

source/blender/blenkernel/intern/particle_system.c

index 666ba31faed8d3a90b6f316eb3d76c9076a5e9d3..c2aa297b1749c2b86e4c024ea360a48e90ec759e 100644 (file)
@@ -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);