[Bf-blender-cvs] [3118636f81a] master: Fix Smear Tool too weak on high poly meshes

[Pablo Dobarro]

Commit: 3118636f81a45d39e79e7a9a287056de1e8123cd
Author: Pablo Dobarro
Date:   Fri Jun 26 19:58:33 2020 +0200
Branches: master
https://developer.blender.org/rB3118636f81a45d39e79e7a9a287056de1e8123cd

Fix Smear Tool too weak on high poly meshes

The defaults for the Smear tool were making it too weak in high poly
meshes, specially the alpha/pressure option enabled by default. Now this
option is disabled, it has a linear pressure curve and less spacing.

Reviewed By: sergey

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

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

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 417fd182e73..366182f3bd7 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -1603,7 +1603,8 @@ void BKE_brush_sculpt_reset(Brush *br)
       break;
     case SCULPT_TOOL_SMEAR:
       br->alpha = 1.0f;
-      br->spacing = 7;
+      br->spacing = 5;
+      br->flag &= ~BRUSH_ALPHA_PRESSURE;
       br->flag &= ~BRUSH_SPACE_ATTEN;
       br->curve_preset = BRUSH_CURVE_SPHERE;
       break;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index e03e7958595..e2d69c7b0be 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2148,8 +2148,7 @@ static float brush_strength(const Sculpt *sd,
       final_pressure = pressure * pressure;
       return final_pressure * overlap * feather;
     case SCULPT_TOOL_SMEAR:
-      final_pressure = pressure * pressure;
-      return final_pressure * overlap * feather;
+      return pressure * overlap * feather;
     case SCULPT_TOOL_CLAY_STRIPS:
       /* Clay Strips needs less strength to compensate the curve. */
       final_pressure = powf(pressure, 1.5f);