[Bf-blender-cvs] [d3742022c26] sculpt-dev: Sculpt: Make global smooth factor control the strengh directly

[Pablo Dobarro]

Commit: d3742022c26f5f50e0bb6baf87ed1f962291c7bf
Author: Pablo Dobarro
Date:   Wed Mar 3 18:52:16 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBd3742022c26f5f50e0bb6baf87ed1f962291c7bf

Sculpt: Make global smooth factor control the strengh directly

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

M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 5ac238d2ef4..cabe39ae774 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2473,11 +2473,11 @@ static float brush_strength(const Sculpt *sd,
       }
 
     case SCULPT_TOOL_SMOOTH: {
-      const float smooth_strength_base = flip * alpha * pressure * feather;
+      const float smooth_strength_base = flip * pressure * feather;
       if (cache->alt_smooth) {
         return smooth_strength_base * sd->smooth_strength_factor;
       }
-      return smooth_strength_base;
+      return smooth_strength_base * alpha;
     }
 
     case SCULPT_TOOL_PINCH: