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 /source/blender/blenkernel/intern/fluid.c | |
parent | 5da05dd627869eb0cff81f74b6bbfd7875f86e51 (diff) | |
parent | 0e6820cc5d6244236dcf0087784202da4b7ff817 (diff) |
Merge branch 'blender-v2.91-release'
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 a940a8a97c7..00a81e6ea2d 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3202,9 +3202,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 } } } |