From 3ea554e0a26857bb8bc37792b665f63cef3689d5 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Fri, 1 Jun 2012 15:49:39 +0000 Subject: Smoke Bugfix: Velocity of moving objects was too high after scaling patch. Spoted by MiikaH. --- source/blender/blenkernel/intern/smoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/smoke.c') diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 46286eb6cf9..7a5465edf02 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1172,7 +1172,7 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds, 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) -- cgit v1.2.3