Sculpt: Remove hardcoded hardness from Clay brush
authorPablo Dobarro <pablodp606@gmail.com>
Mon, 9 Mar 2020 15:35:07 +0000 (16:35 +0100)
committerPablo Dobarro <pablodp606@gmail.com>
Mon, 9 Mar 2020 18:29:18 +0000 (19:29 +0100)
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

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

index 1716439c3fd9d2af647a7b72d9d6317ddf047856..74c492573b1f479260c0bd55a34c146c2841c951 100644 (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;
index 443aaef85c5c832302727184d457cb3ca89630e9..f389dfb84ea6f375f05a3dec5bb9651048e8655c 100644 (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,