blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix cloth filter not working after merge

This commit is contained in:
Pablo Dobarro 2021-02-11 17:54:54 +01:00
parent a56fb568ed
commit faccaee6c3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/sculpt_paint/sculpt_cloth.c
View File

@ -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);