[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47334] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke Bugfix: Velocity of moving objects was too high after scaling patch.

[Daniel Genrich]

Revision: 47334
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47334
Author:   genscher
Date:     2012-06-01 15:49:39 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
Smoke Bugfix: Velocity of moving objects was too high after scaling patch.

Spoted by MiikaH.

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

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-06-01 15:16:58 UTC (rev 47333)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-06-01 15:49:39 UTC (rev 47334)
@@ -1172,7 +1172,7 @@
 
 				sub_v3_v3v3(vel, pos, oldpos);
 				/* Scale velocity to incorperate the object movement during this step */
-				mul_v3_fl(vel, 1.0 / (totalsteps * dt));
+				mul_v3_fl(vel, 1.0 / (totalsteps * dt * sds->scale));
 				// mul_v3_fl(vel, 1.0 / dt);
 
 				// DG TODO: cap velocity to maxVelMag (or maxvel)