[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36504] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#27294] Subframes cause dampened particles to behave differently

Janne Karhu jhkarh at gmail.com
Thu May 5 19:07:20 CEST 2011


Revision: 36504
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36504
Author:   jhk
Date:     2011-05-05 17:07:20 +0000 (Thu, 05 May 2011)
Log Message:
-----------
Fix for [#27294] Subframes cause dampened particles to behave differently
* The unphysical particle damping wasn't scaled according to the timestep.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-05-05 15:21:43 UTC (rev 36503)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-05-05 17:07:20 UTC (rev 36504)
@@ -2553,7 +2553,7 @@
 
 	/* 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);
 




More information about the Bf-blender-cvs mailing list