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:
authorSebastián Barschkis <sebbas@sebbas.org>2020-11-18 17:39:43 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-11-18 17:39:43 +0300
commit957f14a689e2757adf463a7d8507093805870123 (patch)
tree802a2623723ad3ae662bb3639112ce2ff60133d1 /source/blender/blenkernel/intern/fluid.c
parentf132d74c7dc0eb7029ca67997469a03090c18324 (diff)
parent4edaa796d3396fcadc73596e6c6232a498a12e3c (diff)
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
-rw-r--r--source/blender/blenkernel/intern/fluid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 30bf84ae6e1..434456a922e 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3202,6 +3202,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];