[Bf-blender-cvs] [faccaee6c3b] sculpt-dev: Fix cloth filter not working after merge

[Pablo Dobarro]

Commit: faccaee6c3b39c6938c3ed9911b6af87e23772ff
Author: Pablo Dobarro
Date:   Thu Feb 11 17:54:54 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBfaccaee6c3b39c6938c3ed9911b6af87e23772ff

Fix cloth filter not working after merge

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

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 b6dd205a731..4f27ac177b4 100644
--- a/source/blender/editors/sculpt_paint/sculpt_cloth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c
@@ -865,6 +865,9 @@ static void do_cloth_brush_solve_simulation_task_cb_ex(
     const float mask_v = (1.0f - (vd.mask ? *vd.mask : 0.0f)) *
                          SCULPT_automasking_factor_get(automasking, ss, vd.index);
 
+    madd_v3_v3fl(cloth_sim->pos[i], pos_diff, mask_v);
+    madd_v3_v3fl(cloth_sim->pos[i], cloth_sim->acceleration[i], mask_v);
+
     /* Prevents the vertices from sliding without creating folds when all vertices and forces are
      * in the same plane. */
     float noise[3];
@@ -879,10 +882,6 @@ static void do_cloth_brush_solve_simulation_task_cb_ex(
       cloth_brush_solve_collision(data->ob, cloth_sim, i);
     }
 
-    if (cloth_sim->collider_list != NULL) {
-      cloth_brush_solve_collision(data->ob, cloth_sim, i);
-    }
-
     copy_v3_v3(cloth_sim->last_iteration_pos[i], cloth_sim->pos[i]);
 
     copy_v3_v3(cloth_sim->prev_pos[i], temp);