[Bf-blender-cvs] [2bef8c5ea8b] master: Sculpt: Enable accumulate in scrape brush

[Pablo Dobarro]

Commit: 2bef8c5ea8ba3df69397b998c8be72e92be5da94
Author: Pablo Dobarro
Date:   Thu Sep 26 18:19:52 2019 +0200
Branches: master
https://developer.blender.org/rB2bef8c5ea8ba3df69397b998c8be72e92be5da94

Sculpt: Enable accumulate in scrape brush

This fixes some artifacts when working on curved surfaces. Previous
behavior was with accumulate on, so that is now the default.

Reviewed By: jbakker

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

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

M	source/blender/blenkernel/intern/brush.c
M	source/blender/makesdna/DNA_brush_types.h

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 56ce658d9d7..4df5eb6f263 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -912,6 +912,7 @@ void BKE_brush_sculpt_reset(Brush *br)
     case SCULPT_TOOL_SCRAPE:
       br->alpha = 1.0f;
       br->spacing = 7;
+      br->flag |= BRUSH_ACCUMULATE;
       break;
     case SCULPT_TOOL_ROTATE:
       br->alpha = 1.0;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 06e93a3af1f..a1b50e8f125 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -498,6 +498,7 @@ typedef enum eBrushUVSculptTool {
        SCULPT_TOOL_CLAY, \
        SCULPT_TOOL_CLAY_STRIPS, \
        SCULPT_TOOL_ROTATE, \
+       SCULPT_TOOL_SCRAPE, \
        SCULPT_TOOL_FLATTEN)
 
 #define SCULPT_TOOL_HAS_NORMAL_WEIGHT(t) ELEM(t, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK)