diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-18 17:38:00 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-18 17:38:00 +0300 |
| commit | 4edaa796d3396fcadc73596e6c6232a498a12e3c (patch) | |
| tree | 688008961ccd9422144a988eb3a4a01c7e056d70 /source/blender/blenkernel/intern/fluid.c | |
| parent | 549a1cac88a12193faf2251edb1134270e8a1360 (diff) | |
Fluid: Revert changes from T82488
Scaling of forces needs more work. Before making changes to them it would be nice to have a setup, that works physically correct across multiple modifiers (cloth, rigid bodies, fluid).
This will be a to do for 2.92.
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index b9f201d8ada..452e01363ab 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3196,6 +3196,8 @@ static void update_effectors_task_cb(void *__restrict userdata, mul_v3_fl(retvel, mag); /* Copy computed force to fluid solver forces. */ + mul_v3_fl(retvel, 0.2f); /* Factor from 0e6820cc5d62. */ + CLAMP3(retvel, -1.0f, 1.0f); /* Restrict forces to +-1 interval. */ data->force_x[index] = retvel[0]; data->force_y[index] = retvel[1]; data->force_z[index] = retvel[2]; |