[Bf-blender-cvs] [94597cd43c1] greasepencil-object: Cleanup: Move enum definition to right file

[Antonio Vazquez]

Commit: 94597cd43c123434e155cdaad04a5f0eb890d4eb
Author: Antonio Vazquez
Date:   Wed Mar 14 09:54:26 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB94597cd43c123434e155cdaad04a5f0eb890d4eb

Cleanup: Move enum definition to right file

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

M	source/blender/makesdna/DNA_brush_types.h
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index f08e492c434..533a08b1bb5 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -236,6 +236,21 @@ typedef enum eGP_BrushEraserMode {
 	GP_BRUSH_ERASER_STROKE = 2,
 } eGP_BrushEraserMode;
 
+/* default brush icons */
+typedef enum eGP_BrushIcons {
+	GPBRUSH_CUSTOM = 0,
+	GPBRUSH_PENCIL = 1,
+	GPBRUSH_PEN = 2,
+	GPBRUSH_INK = 3,
+	GPBRUSH_INKNOISE = 4,
+	GPBRUSH_BLOCK = 5,
+	GPBRUSH_MARKER = 6,
+	GPBRUSH_FILL = 7,
+	GPBRUSH_ERASE_SOFT = 8,
+	GPBRUSH_ERASE_HARD = 9,
+	GPBRUSH_ERASE_STROKE = 10
+} eGP_BrushIcons;
+
 typedef struct PaletteColor {
 	struct PaletteColor *next, *prev;
 	struct Image *sima;      /* Texture image for strokes */
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 5c099b1ad43..7db4da670d9 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -469,21 +469,6 @@ typedef enum eGP_DepthOrdering {
 	GP_XRAY_BACK  = 2
 } eGP_DepthOrdering;
 
-/* default brush icons */
-typedef enum eGP_BrushIcons {
-	GPBRUSH_CUSTOM = 0,
-	GPBRUSH_PENCIL = 1,
-	GPBRUSH_PEN = 2,
-	GPBRUSH_INK = 3,
-	GPBRUSH_INKNOISE = 4,
-	GPBRUSH_BLOCK = 5,
-	GPBRUSH_MARKER = 6,
-	GPBRUSH_FILL = 7,
-	GPBRUSH_ERASE_SOFT = 8,
-	GPBRUSH_ERASE_HARD = 9,
-	GPBRUSH_ERASE_STROKE = 10
-} eGP_BrushIcons;
-
 /* ***************************************** */
 /* Mode Checking Macros */