blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix variable simulation steps with cloth deform brushes 

Cloth deform brushes (both in cloth brush or other tools with cloth
simulation targets) should not have their spacing as a value relative
the brush radius to avoid affecting the simulation speed when changing
the brush radius.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D8620
This commit is contained in:
Pablo Dobarro 2020-08-18 21:37:39 +02:00
parent b3bd121dd4
commit d74c495838
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@ -691,6 +691,14 @@ static float paint_space_stroke_spacing(bContext *C,
spacing = spacing * (1.5f - spacing_pressure);
}
if (SCULPT_is_cloth_deform_brush(brush)) {
/* The spacing in tools that use the cloth solver should not be affected by the brush radius to
* avoid affecting the simulation update rate when changing the radius of the brush.
With a value of 100 and the brush default of 10 for spacing, a simulation step runs every 2
pixels movement of the cursor. */
size_clamp = 100.0f;
}
/* stroke system is used for 2d paint too, so we need to account for
* the fact that brush can be scaled there. */
spacing *= stroke->zoom_2d;
@ -1001,7 +1009,7 @@ bool paint_space_stroke_enabled(Brush *br, ePaintMode mode)
return false;
}
if (br->sculpt_tool == SCULPT_TOOL_CLOTH) {
if (br->sculpt_tool == SCULPT_TOOL_CLOTH || SCULPT_is_cloth_deform_brush(br)) {
/* The Cloth Brush is a special case for stroke spacing. Even if it has grab modes which do
* not support dynamic size, stroke spacing needs to be enabled so it is possible to control
* whether the simulation runs constantly or only when the brush moves when using the cloth