[Bf-blender-cvs] [c930cd7450c] master: Clay Thumb: Remove hardcoded hardness value

[Pablo Dobarro]

Commit: c930cd7450c4aeb5928f6d343fde06ae9a02ef21
Author: Pablo Dobarro
Date:   Sun Mar 1 20:13:29 2020 +0100
Branches: master
https://developer.blender.org/rBc930cd7450c4aeb5928f6d343fde06ae9a02ef21

Clay Thumb: Remove hardcoded hardness value

Clay Thumb was using a custom hardness implementation and value to make
it functional. Hardness is now a property of brushes and it is
implemented for all brushes, so this is no longer needed.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D6981

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

M	source/blender/blenkernel/intern/brush.c
M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 09b3ad89e73..1d3965fc7c3 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -943,6 +943,7 @@ void BKE_brush_sculpt_reset(Brush *br)
       br->alpha = 0.5f;
       br->normal_radius_factor = 1.0f;
       br->spacing = 6;
+      br->hardness = 0.5f;
       br->flag |= BRUSH_SIZE_PRESSURE;
       br->flag &= ~BRUSH_SPACE_ATTEN;
       break;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index e203cabe22d..c0f843a47bb 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5344,7 +5344,6 @@ static void do_clay_thumb_brush_task_cb_ex(void *__restrict userdata,
   float(*mat)[4] = data->mat;
   const float *area_no_sp = data->area_no_sp;
   const float *area_co = data->area_co;
-  const float hardness = 0.50f;
 
   PBVHVertexIter vd;
   float(*proxy)[3];
@@ -5387,17 +5386,10 @@ static void do_clay_thumb_brush_task_cb_ex(void *__restrict userdata,
       interp_v3_v3v3(intr, intr, intr_tilt, tilt_mix);
       sub_v3_v3v3(val, intr_tilt, vd.co);
 
-      /* Deform the real vertex test distance with a hardness factor. This moves the falloff
-       * towards the edges of the brush, producing a more defined falloff and a flat center. */
-      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 * tex_strength(ss,
                                                   brush,
                                                   vd.co,
-                                                  dist,
+                                                  sqrtf(test.dist),
                                                   vd.no,
                                                   vd.fno,
                                                   vd.mask ? *vd.mask : 0.0f,