[Bf-blender-cvs] [af2de3cfd7e] greasepencil-object: GPencil: Change default preset to use range by mode

[Antonio Vazquez]

Commit: af2de3cfd7e928e8d91806614f53dcb7f2d77e6e
Author: Antonio Vazquez
Date:   Wed Nov 27 08:18:09 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBaf2de3cfd7e928e8d91806614f53dcb7f2d77e6e

GPencil: Change default preset to use range by mode

In this way is easier to include new brushes by mode.

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

M	source/blender/makesdna/DNA_brush_types.h

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

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 8e2236b1a25..c2be0a98dbb 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -131,10 +131,12 @@ typedef struct BrushGpencilSettings {
   struct Material *material;
 } BrushGpencilSettings;
 
-/* BrushGpencilSettings->preset_type. */
+/* BrushGpencilSettings->preset_type.
+ * Use a range for each group and not continuous values.*/
 typedef enum eGPBrush_Presets {
   GP_BRUSH_PRESET_UNKNOWN = 0,
 
+  /* Draw 1-99. */
   GP_BRUSH_PRESET_AIRBRUSH = 1,
   GP_BRUSH_PRESET_INK_PEN = 2,
   GP_BRUSH_PRESET_INK_PEN_ROUGH = 3,
@@ -150,23 +152,26 @@ typedef enum eGPBrush_Presets {
   GP_BRUSH_PRESET_ERASER_STROKE = 13,
   GP_BRUSH_PRESET_TINT = 14,
 
-  GP_BRUSH_PRESET_VERTEX_DRAW = 15,
-  GP_BRUSH_PRESET_VERTEX_BLUR = 16,
-  GP_BRUSH_PRESET_VERTEX_AVERAGE = 17,
-  GP_BRUSH_PRESET_VERTEX_SMEAR = 18,
-  GP_BRUSH_PRESET_VERTEX_REPLACE = 19,
-
-  GP_BRUSH_PRESET_SMOOTH_STROKE = 20,
-  GP_BRUSH_PRESET_STRENGTH_STROKE = 21,
-  GP_BRUSH_PRESET_THICKNESS_STROKE = 22,
-  GP_BRUSH_PRESET_GRAB_STROKE = 23,
-  GP_BRUSH_PRESET_PUSH_STROKE = 24,
-  GP_BRUSH_PRESET_TWIST_STROKE = 25,
-  GP_BRUSH_PRESET_PINCH_STROKE = 26,
-  GP_BRUSH_PRESET_RANDOMIZE_STROKE = 27,
-  GP_BRUSH_PRESET_CLONE_STROKE = 28,
-
-  GP_BRUSH_PRESET_DRAW_WEIGHT = 29,
+  /* Vertex Paint 100-199. */
+  GP_BRUSH_PRESET_VERTEX_DRAW = 100,
+  GP_BRUSH_PRESET_VERTEX_BLUR = 101,
+  GP_BRUSH_PRESET_VERTEX_AVERAGE = 102,
+  GP_BRUSH_PRESET_VERTEX_SMEAR = 103,
+  GP_BRUSH_PRESET_VERTEX_REPLACE = 104,
+
+  /* Sculpt 200-299. */
+  GP_BRUSH_PRESET_SMOOTH_STROKE = 200,
+  GP_BRUSH_PRESET_STRENGTH_STROKE = 201,
+  GP_BRUSH_PRESET_THICKNESS_STROKE = 202,
+  GP_BRUSH_PRESET_GRAB_STROKE = 203,
+  GP_BRUSH_PRESET_PUSH_STROKE = 204,
+  GP_BRUSH_PRESET_TWIST_STROKE = 205,
+  GP_BRUSH_PRESET_PINCH_STROKE = 206,
+  GP_BRUSH_PRESET_RANDOMIZE_STROKE = 207,
+  GP_BRUSH_PRESET_CLONE_STROKE = 208,
+
+  /* Weight Paint 300-399. */
+  GP_BRUSH_PRESET_DRAW_WEIGHT = 300,
 } eGPBrush_Presets;
 
 /* BrushGpencilSettings->gp_flag */
@@ -670,6 +675,7 @@ typedef enum eBrushUVSculptTool {
         * \ \ \ \ \ \ \ \ \ \ \ \ \
         * \ \ \ \ \ \ \ \ \ \ \ \ \ \
         * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
+        * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
         * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ but user feedback indicates it's better not to */ \
        SCULPT_TOOL_SMOOTH, \
        SCULPT_TOOL_MASK) == 0)