[Bf-blender-cvs] [301651ae51e] greasepencil-object: Change Brush names to organize alphabetically

[Antonio Vazquez]

Commit: 301651ae51e963bbb05f32ae161e5a1be7559349
Author: Antonio Vazquez
Date:   Mon Mar 12 09:53:53 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB301651ae51e963bbb05f32ae161e5a1be7559349

Change Brush names to organize alphabetically

As the panel is sorted by name, it's better to have names that keep brushes grouped.

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

M	source/blender/blenkernel/intern/brush.c

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

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index d2b06397b5d..4af5c9e50ab 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -269,7 +269,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	CurveMapping *custom_curve;
 
 	/* Pencil brush */
-	brush = BKE_brush_add_gpencil(bmain, ts, "Pencil");
+	brush = BKE_brush_add_gpencil(bmain, ts, "Draw Pencil");
 	brush->thickness = 25.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
 	brush->draw_sensitivity = 1.0f;
@@ -300,7 +300,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->gp_lazy_factor = LAZY_FACTOR;
 
 	/* Pen brush */
-	brush = BKE_brush_add_gpencil(bmain, ts, "Pen");
+	brush = BKE_brush_add_gpencil(bmain, ts, "Draw Pen");
 	deft = brush; /* save default brush */
 	brush->thickness = 30.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
@@ -332,7 +332,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->gp_lazy_factor = LAZY_FACTOR;
 
 	/* Ink brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Ink");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Draw Ink");
 	brush->thickness = 60.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
 	brush->draw_sensitivity = 1.6f;
@@ -367,7 +367,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush_gpencil_curvemap_reset(custom_curve->cm, GPCURVE_PRESET_INK);
 
 	/* Ink Noise brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Ink noise");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Draw Noise");
 	brush->thickness = 60.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
 	brush->draw_sensitivity = 1.0f;
@@ -402,7 +402,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush_gpencil_curvemap_reset(custom_curve->cm, GPCURVE_PRESET_INKNOISE);
 
 	/* Block Basic brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Block Basic");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Draw Block");
 	brush->thickness = 150.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
 	brush->draw_sensitivity = 1.0f;
@@ -432,7 +432,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->gp_lazy_factor = LAZY_FACTOR;
 
 	/* Marker brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Marker");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Draw Marker");
 	brush->thickness = 80.0f;
 	brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
 	brush->draw_sensitivity = 1.0f;
@@ -483,7 +483,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->draw_strength = 1.0f;
 
 	/* Soft Eraser brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Soft Eraser");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Soft");
 	brush->thickness = 30.0f;
 	brush->gp_flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
 	brush->gp_icon_id = GPBRUSH_ERASE_SOFT;
@@ -491,7 +491,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->gp_eraser_mode = GP_BRUSH_ERASER_SOFT;
 
 	/* Hard Eraser brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Hard Eraser");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Hard");
 	brush->thickness = 30.0f;
 	brush->gp_flag |= GP_BRUSH_ENABLE_CURSOR;
 	brush->gp_icon_id = GPBRUSH_ERASE_HARD;
@@ -499,7 +499,7 @@ void BKE_brush_gpencil_presets(bContext *C)
 	brush->gp_eraser_mode = GP_BRUSH_ERASER_HARD;
 
 	/* Stroke Eraser brush */
-	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Stroke Eraser");
+	brush = brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Stroke");
 	brush->thickness = 30.0f;
 	brush->gp_flag |= GP_BRUSH_ENABLE_CURSOR;
 	brush->gp_icon_id = GPBRUSH_ERASE_STROKE;