diff options
| author | Pablo Dobarro <pablodp606@gmail.com> | 2020-03-09 18:35:07 +0300 |
|---|---|---|
| committer | Pablo Dobarro <pablodp606@gmail.com> | 2020-03-09 21:29:18 +0300 |
| commit | c65b9fb825f61dceda5fc4565c8df01a3b837447 (patch) | |
| tree | 6cf639a35b3281e61030bfb2dd53c12cf940d2d3 /source/blender/editors | |
| parent | 6eb76f64304235bd91e7a226019da5424e0b28d3 (diff) | |
Sculpt: Remove hardcoded hardness from Clay brush
Hardness is now a property implemented for all brushes, so this is no
longer needed.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D7078
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 443aaef85c5..f389dfb84ea 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4888,7 +4888,6 @@ static void do_clay_brush_task_cb_ex(void *__restrict userdata, const Brush *brush = data->brush; const float *area_no = data->area_no; const float *area_co = data->area_co; - const float hardness = 0.65f; PBVHVertexIter vd; float(*proxy)[3]; @@ -4911,15 +4910,10 @@ static void do_clay_brush_task_cb_ex(void *__restrict userdata, sub_v3_v3v3(val, intr, vd.co); - float dist = sqrtf(test.dist); - float p = dist / ss->cache->radius; - p = (p - hardness) / (1.0f - hardness); - CLAMP(p, 0.0f, 1.0f); - dist *= p; const float fade = bstrength * SCULPT_brush_strength_factor(ss, brush, vd.co, - dist, + sqrtf(test.dist), vd.no, vd.fno, vd.mask ? *vd.mask : 0.0f, |