diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-09 14:53:27 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-09 14:53:27 +0300 |
commit | 0e6820cc5d6244236dcf0087784202da4b7ff817 (patch) | |
tree | 256d1be57b3031c06604ec785f06c0e930e970f7 /source/blender/blenkernel/intern/fluid.c | |
parent | 29693c7b070a05ffe8789ecdce34852fd0e31ecf (diff) |
Fix T82488: Mantaflow - force fields have very low influence compare to 2.90.1
Removed 0.2f factor when setting forces. Why this factor has been used when forces should only be clamped, nobody knows ..
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
-rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 9ad352c8455..d8573b9f032 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3196,9 +3196,15 @@ static void update_effectors_task_cb(void *__restrict userdata, mul_v3_fl(retvel, mag); /* Constrain forces to interval -1 to 1. */ - data->force_x[index] = min_ff(max_ff(-1.0f, retvel[0] * 0.2f), 1.0f); - data->force_y[index] = min_ff(max_ff(-1.0f, retvel[1] * 0.2f), 1.0f); - data->force_z[index] = min_ff(max_ff(-1.0f, retvel[2] * 0.2f), 1.0f); + CLAMP3(retvel, -1.0f, 1.0f); + data->force_x[index] = retvel[0]; + data->force_y[index] = retvel[1]; + data->force_z[index] = retvel[2]; + +# if DEBUG_PRINT + /* Debugging: Print forces. */ + printf("setting force: [%f, %f, %f]\n", data->force_x[index], data->force_y[index], data->force_z[index]); +# endif } } } |