diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-09 14:54:26 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-09 14:54:26 +0300 |
| commit | 0c4d12986a746b644c177224e4f70edec1f50d7a (patch) | |
| tree | a348203e7ef416784a466f2e124635c9f0162204 /intern/mantaflow | |
| parent | 5da05dd627869eb0cff81f74b6bbfd7875f86e51 (diff) | |
| parent | 0e6820cc5d6244236dcf0087784202da4b7ff817 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'intern/mantaflow')
| -rw-r--r-- | intern/mantaflow/intern/strings/fluid_script.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h index 0df9e0e8df0..1f22f4b3d21 100644 --- a/intern/mantaflow/intern/strings/fluid_script.h +++ b/intern/mantaflow/intern/strings/fluid_script.h @@ -360,7 +360,6 @@ def fluid_pre_step_$ID$():\n\ \n\ # Main vel grid is copied in adapt time step function\n\ \n\ - # translate obvels (world space) to grid space\n\ if using_obstacle_s$ID$:\n\ # Average out velocities from multiple obstacle objects at one cell\n\ x_obvel_s$ID$.safeDivide(numObs_s$ID$)\n\ @@ -368,7 +367,6 @@ def fluid_pre_step_$ID$():\n\ z_obvel_s$ID$.safeDivide(numObs_s$ID$)\n\ copyRealToVec3(sourceX=x_obvel_s$ID$, sourceY=y_obvel_s$ID$, sourceZ=z_obvel_s$ID$, target=obvelC_s$ID$)\n\ \n\ - # translate invels (world space) to grid space\n\ if using_invel_s$ID$:\n\ copyRealToVec3(sourceX=x_invel_s$ID$, sourceY=y_invel_s$ID$, sourceZ=z_invel_s$ID$, target=invelC_s$ID$)\n\ \n\ @@ -378,7 +376,6 @@ def fluid_pre_step_$ID$():\n\ interpolateMACGrid(source=guidevel_sg$ID$, target=velT_s$ID$)\n\ velT_s$ID$.multConst(vec3(gamma_sg$ID$))\n\ \n\ - # translate external forces (world space) to grid space\n\ copyRealToVec3(sourceX=x_force_s$ID$, sourceY=y_force_s$ID$, sourceZ=z_force_s$ID$, target=forces_s$ID$)\n\ \n\ # If obstacle has velocity, i.e. is a moving obstacle, switch to dynamic preconditioner\n\ |