[Bf-blender-cvs] [b612a7f7a8] fluid-mantaflow: obvels need scaling before manta can use them

Sebastián Barschkis noreply at git.blender.org
Tue Mar 7 01:26:35 CET 2017


Commit: b612a7f7a8c940be5e489ccff375a4510e78b611
Author: Sebastián Barschkis
Date:   Mon Feb 27 19:20:11 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBb612a7f7a8c940be5e489ccff375a4510e78b611

obvels need scaling before manta can use them

===================================================================

M	intern/mantaflow/intern/strings/smoke_script.h

===================================================================

diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 4d9b8cdf1f..b8142ffe93 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -189,6 +189,11 @@ xl_react = xl.create(RealGrid)\n";
 
 const std::string smoke_pre_step_low = "\n\
 def smoke_pre_step_low():\n\
+    # translate obvels (world space) to grid space\n\
+    x_obvel.multConst(gs.x)\n\
+    y_obvel.multConst(gs.y)\n\
+    z_obvel.multConst(gs.z)\n\
+    \n\
     copyRealToVec3(sourceX=x_vel, sourceY=y_vel, sourceZ=z_vel, target=vel)\n\
     copyRealToVec3(sourceX=x_obvel, sourceY=y_obvel, sourceZ=z_obvel, target=obvel)\n\
     copyRealToVec3(sourceX=x_force, sourceY=y_force, sourceZ=z_force, target=forces)\n";




More information about the Bf-blender-cvs mailing list