Revision: 56951
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56951
Author: miikah
Date: 2013-05-21 18:59:46 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Fix: Smoke adaptive domain applied velocity in wrong unit space causing high
velocities never apply additional margin ahead the fluid.
Also skip new flow velocity because thats not accurate enough to be of any use
in there.
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 2013-05-21
18:57:19 UTC (rev 56950)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2013-05-21
18:59:46 UTC (rev 56951)
@@ -1789,19 +1789,12 @@
if (max[1] < y) max[1] = y;
if (max[2] < z) max[2] = z;
}
- /* velocity bounds */
- if (em->velocity) {
- if (min_vel[0] >
em->velocity[index * 3]) min_vel[0] = em->velocity[index * 3];
- if (min_vel[1] >
em->velocity[index * 3 + 1]) min_vel[1] = em->velocity[index * 3 + 1];
- if (min_vel[2] >
em->velocity[index * 3 + 2]) min_vel[2] = em->velocity[index * 3 + 2];
- if (max_vel[0] <
em->velocity[index * 3]) max_vel[0] = em->velocity[index * 3];
- if (max_vel[1] <
em->velocity[index * 3 + 1]) max_vel[1] = em->velocity[index * 3 + 1];
- if (max_vel[2] <
em->velocity[index * 3 + 2]) max_vel[2] = em->velocity[index * 3 + 2];
- }
}
}
/* calculate new bounds based on these values */
+ mul_v3_fl(min_vel, 1.0f / sds->dx);
+ mul_v3_fl(max_vel, 1.0f / sds->dx);
clampBoundsInDomain(sds, min, max, min_vel, max_vel, sds->adapt_margin
+ 1, dt);
for (i = 0; i < 3; i++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
