From 4edaa796d3396fcadc73596e6c6232a498a12e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastia=CC=81n=20Barschkis?= Date: Wed, 18 Nov 2020 15:38:00 +0100 Subject: 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. --- source/blender/blenkernel/intern/fluid.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenkernel/intern/fluid.c') 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]; -- cgit v1.2.3