[Bf-blender-cvs] [a2b517cb11c] master: Sculpt: Modify damping using the simulation factor of the cloth brush

[Pablo Dobarro]

Commit: a2b517cb11c9a9fc934108dd3bfc01a01b29a870
Author: Pablo Dobarro
Date:   Thu Oct 1 22:52:55 2020 +0200
Branches: master
https://developer.blender.org/rBa2b517cb11c9a9fc934108dd3bfc01a01b29a870

Sculpt: Modify damping using the simulation factor of the cloth brush

This helps blending artifacts with dynamic simulation areas as the
damping increases when the vertex.

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D9084

===================================================================

M	source/blender/editors/sculpt_paint/sculpt_cloth.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c
index 1e8c150a43b..2bca5e2e1f0 100644
--- a/source/blender/editors/sculpt_paint/sculpt_cloth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c
@@ -715,7 +715,7 @@ static void do_cloth_brush_solve_simulation_task_cb_ex(
 
       float pos_diff[3];
       sub_v3_v3v3(pos_diff, cloth_sim->pos[i], cloth_sim->prev_pos[i]);
-      mul_v3_fl(pos_diff, (1.0f - cloth_sim->damping));
+      mul_v3_fl(pos_diff, (1.0f - cloth_sim->damping) * sim_factor);
 
       const float mask_v = (1.0f - (vd.mask ? *vd.mask : 0.0f)) *
                            SCULPT_automasking_factor_get(ss, vd.index);