Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2012-06-01 19:49:39 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2012-06-01 19:49:39 +0400
commit3ea554e0a26857bb8bc37792b665f63cef3689d5 (patch)
tree8d133a544fb338e69feb4a920fc8dc07f71d95ec /source/blender/blenkernel/intern/smoke.c
parentabc1a277629d8bec7dc6e03635a89e508d487148 (diff)
Smoke Bugfix: Velocity of moving objects was too high after scaling patch.
Spoted by MiikaH.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r--source/blender/blenkernel/intern/smoke.c2
1 files changed, 1 insertions, 1 deletions
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)