Tool System: brushes are now categorized by tool

The toolbar now shows brush types, the brush selector now
only shows brushes matching the current tool type.

Details:

- Add's Paint.tool_slots (used by the toolbar).
- Removed custom grease pencil brush tool code.
- Bumped subversion.

See T57526 for details.

1 files changed, 12 insertions, 9 deletions

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 4801aee3c60..9cf23f30287 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -80,8 +80,7 @@ typedef struct BrushGpencilSettings {
 
 	int   input_samples;   /* maximum distance before generate new point for very fast mouse movements */
 	float uv_random;       /* random factor for UV rotation */
-
-	int   brush_type;      /* type of brush (draw, fill, erase, etc..) */
+	int   brush_type DNA_DEPRECATED;  /* moved to 'Brush.gpencil_tool' */
 	int   eraser_mode;     /* soft, hard or stroke */
 	float active_smooth;   /* smooth while drawing factor */
 	float era_strength_f;  /* factor to apply to strength for soft eraser */
@@ -133,13 +132,6 @@ typedef enum eGP_FillDrawModes {
 	GP_FILL_DMODE_CONTROL = 2,
 } eGP_FillDrawModes;
 
-/* BrushGpencilSettings->brush type */
-typedef enum eGP_BrushType {
-	GP_BRUSH_TYPE_DRAW = 0,
-	GP_BRUSH_TYPE_FILL = 1,
-	GP_BRUSH_TYPE_ERASE = 2,
-} eGP_BrushType;
-
 /* BrushGpencilSettings->gp_eraser_mode */
 typedef enum eGP_BrushEraserMode {
 	GP_BRUSH_ERASER_SOFT = 0,
@@ -216,6 +208,8 @@ typedef struct Brush {
 	char vertexpaint_tool;  /* active vertex/weight paint blend mode (poorly named) */
 	char imagepaint_tool;   /* active image paint tool */
 	char mask_tool;         /* enum eBrushMaskTool, only used if sculpt_tool is SCULPT_TOOL_MASK */
+	char gpencil_tool;      /* Active grease pencil tool. */
+	char _pad0[7];
 
 	float autosmooth_factor;
 
@@ -416,6 +410,15 @@ typedef enum eBrushImagePaintTool {
 	PAINT_TOOL_MASK = 5
 } eBrushImagePaintTool;
 
+
+/* BrushGpencilSettings->brush type */
+typedef enum eBrushGPaintTool {
+	GPAINT_TOOL_DRAW = 0,
+	GPAINT_TOOL_FILL = 1,
+	GPAINT_TOOL_ERASE = 2,
+} eBrushGPaintTool;
+
+
 /* direction that the brush displaces along */
 enum {
 	SCULPT_DISP_DIR_AREA = 0,