blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

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
This commit is contained in:
Pablo Dobarro 2020-03-09 16:35:07 +01:00
parent 6eb76f6430
commit c65b9fb825
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/brush.c
View File

@ -1303,6 +1303,7 @@ void BKE_brush_sculpt_reset(Brush *br)
br->spacing = 3;
br->autosmooth_factor = 0.25f;
br->normal_radius_factor = 0.75f;
br->hardness = 0.65f;
break;
case SCULPT_TOOL_CLAY_THUMB:
br->alpha = 0.5f;

8
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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,