From 0e6820cc5d6244236dcf0087784202da4b7ff817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastia=CC=81n=20Barschkis?= Date: Mon, 9 Nov 2020 12:53:27 +0100 Subject: 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 .. --- source/blender/blenkernel/intern/fluid.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender') 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 } } } -- cgit v1.2.3