[Bf-blender-cvs] [83df53ccc8f] greasepencil-object: Cleanup: Rename eGP_BrushIcons items
Antonio Vazquez
noreply at git.blender.org
Sun May 13 13:00:26 CEST 2018
Commit: 83df53ccc8fb8511962602133a6e848eea35eec3
Author: Antonio Vazquez
Date: Sun May 13 13:00:19 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB83df53ccc8fb8511962602133a6e848eea35eec3
Cleanup: Rename eGP_BrushIcons items
===================================================================
M source/blender/blenkernel/intern/brush.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/interface/interface_icons.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 3cb6b989c13..6083ac21f1a 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -141,7 +141,7 @@ static void brush_defaults(Brush *brush)
brush->draw_strength = 1.0f;
brush->draw_jitter = 0.0f;
brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
- brush->gp_icon_id = GPBRUSH_PEN;
+ brush->gp_icon_id = GP_BRUSH_ICON_PEN;
/* curves */
brush->curve_sensitivity = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -291,7 +291,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothlvl = 3;
brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
- brush->gp_icon_id = GPBRUSH_PENCIL;
+ brush->gp_icon_id = GP_BRUSH_ICON_PENCIL;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -323,7 +323,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothfac = 1.0f;
brush->gp_thick_smoothlvl = 3;
brush->draw_random_sub = 0.0f;
- brush->gp_icon_id = GPBRUSH_PEN;
+ brush->gp_icon_id = GP_BRUSH_ICON_PEN;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -352,7 +352,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothlvl = 3;
brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
- brush->gp_icon_id = GPBRUSH_INK;
+ brush->gp_icon_id = GP_BRUSH_ICON_INK;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -389,7 +389,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothlvl = 2;
brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
- brush->gp_icon_id = GPBRUSH_INKNOISE;
+ brush->gp_icon_id = GP_BRUSH_ICON_INKNOISE;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -425,7 +425,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothlvl = 3;
brush->draw_subdivide = 0;
brush->draw_random_sub = 0;
- brush->gp_icon_id = GPBRUSH_BLOCK;
+ brush->gp_icon_id = GP_BRUSH_ICON_BLOCK;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -456,7 +456,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_thick_smoothlvl = 3;
brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
- brush->gp_icon_id = GPBRUSH_MARKER;
+ brush->gp_icon_id = GP_BRUSH_ICON_MARKER;
brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
@@ -470,7 +470,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gp_fill_leak = 3;
brush->gp_fill_threshold = 0.1f;
brush->gp_fill_simplylvl = 1;
- brush->gp_icon_id = GPBRUSH_FILL;
+ brush->gp_icon_id = GP_BRUSH_ICON_FILL;
brush->gp_brush_type = GP_BRUSH_TYPE_FILL;
brush->draw_smoothfac = 0.5f;
@@ -488,7 +488,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Soft");
brush->size = 30.0f;
brush->gp_flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
- brush->gp_icon_id = GPBRUSH_ERASE_SOFT;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_SOFT;
brush->gp_brush_type = GP_BRUSH_TYPE_ERASE;
brush->gp_eraser_mode = GP_BRUSH_ERASER_SOFT;
@@ -496,7 +496,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Hard");
brush->size = 30.0f;
brush->gp_flag |= GP_BRUSH_ENABLE_CURSOR;
- brush->gp_icon_id = GPBRUSH_ERASE_HARD;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_HARD;
brush->gp_brush_type = GP_BRUSH_TYPE_ERASE;
brush->gp_eraser_mode = GP_BRUSH_ERASER_HARD;
@@ -504,7 +504,7 @@ void BKE_brush_gpencil_presets(bContext *C)
brush = BKE_brush_add_gpencil(bmain, ts, "Eraser Stroke");
brush->size = 30.0f;
brush->gp_flag |= GP_BRUSH_ENABLE_CURSOR;
- brush->gp_icon_id = GPBRUSH_ERASE_STROKE;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_STROKE;
brush->gp_brush_type = GP_BRUSH_TYPE_ERASE;
brush->gp_eraser_mode = GP_BRUSH_ERASER_STROKE;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 583c9626821..cffe9578abb 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1507,7 +1507,7 @@ static Brush *gp_get_default_eraser(Main *bmain, ToolSettings *ts)
brush_dft = BKE_brush_add_gpencil(bmain, ts, "Soft Eraser");
brush_dft->size = 30.0f;
brush_dft->gp_flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
- brush_dft->gp_icon_id = GPBRUSH_ERASE_SOFT;
+ brush_dft->gp_icon_id = GP_BRUSH_ICON_ERASE_SOFT;
brush_dft->gp_brush_type = GP_BRUSH_TYPE_ERASE;
brush_dft->gp_eraser_mode = GP_BRUSH_ERASER_SOFT;
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index da1392d5cbd..0b98712c9a3 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1416,34 +1416,34 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
/* reset the icon */
if (ob->mode & OB_MODE_GPENCIL_PAINT) {
switch (br->gp_icon_id) {
- case GPBRUSH_PENCIL:
+ case GP_BRUSH_ICON_PENCIL:
br->id.icon_id = ICON_GPBRUSH_PENCIL;
break;
- case GPBRUSH_PEN:
+ case GP_BRUSH_ICON_PEN:
br->id.icon_id = ICON_GPBRUSH_PEN;
break;
- case GPBRUSH_INK:
+ case GP_BRUSH_ICON_INK:
br->id.icon_id = ICON_GPBRUSH_INK;
break;
- case GPBRUSH_INKNOISE:
+ case GP_BRUSH_ICON_INKNOISE:
br->id.icon_id = ICON_GPBRUSH_INKNOISE;
break;
- case GPBRUSH_BLOCK:
+ case GP_BRUSH_ICON_BLOCK:
br->id.icon_id = ICON_GPBRUSH_BLOCK;
break;
- case GPBRUSH_MARKER:
+ case GP_BRUSH_ICON_MARKER:
br->id.icon_id = ICON_GPBRUSH_MARKER;
break;
- case GPBRUSH_FILL:
+ case GP_BRUSH_ICON_FILL:
br->id.icon_id = ICON_GPBRUSH_FILL;
break;
- case GPBRUSH_ERASE_SOFT:
+ case GP_BRUSH_ICON_ERASE_SOFT:
br->id.icon_id = ICON_GPBRUSH_ERASE_SOFT;
break;
- case GPBRUSH_ERASE_HARD:
+ case GP_BRUSH_ICON_ERASE_HARD:
br->id.icon_id = ICON_GPBRUSH_ERASE_HARD;
break;
- case GPBRUSH_ERASE_STROKE:
+ case GP_BRUSH_ICON_ERASE_STROKE:
br->id.icon_id = ICON_GPBRUSH_ERASE_STROKE;
break;
default:
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 0ba4060fb21..f5c51b7f711 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -231,16 +231,16 @@ typedef enum eGP_BrushEraserMode {
/* default brush icons */
typedef enum eGP_BrushIcons {
- 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
+ GP_BRUSH_ICON_PENCIL = 1,
+ GP_BRUSH_ICON_PEN = 2,
+ GP_BRUSH_ICON_INK = 3,
+ GP_BRUSH_ICON_INKNOISE = 4,
+ GP_BRUSH_ICON_BLOCK = 5,
+ GP_BRUSH_ICON_MARKER = 6,
+ GP_BRUSH_ICON_FILL = 7,
+ GP_BRUSH_ICON_ERASE_SOFT = 8,
+ GP_BRUSH_ICON_ERASE_HARD = 9,
+ GP_BRUSH_ICON_ERASE_STROKE = 10
} eGP_BrushIcons;
typedef struct PaletteColor {
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 2b5f3acc895..de8423a0867 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -147,16 +147,16 @@ static EnumPropertyItem rna_enum_gpencil_fill_draw_modes_items[] = {
};
static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = {
- { GPBRUSH_PENCIL, "PENCIL", ICON_GPBRUSH_PENCIL, "Pencil", "" },
- { GPBRUSH_PEN, "PEN", ICON_GPBRUSH_PEN, "Pen", "" },
- { GPBRUSH_INK, "INK", ICON_GPBRUSH_INK, "Ink", "" },
- { GPBRUSH_INKNOISE, "INKNOISE", ICON_GPBRUSH_INKNOISE, "Ink Noise", "" },
- { GPBRUSH_BLOCK, "BLOCK", ICON_GPBRUSH_BLOCK, "Block", "" },
- { GPBRUSH_MARKER, "MARKER", ICON_GPBRUSH_MARKER, "Marker", "" },
- { GPBRUSH_FILL, "FILL", ICON_GPBRUSH_FILL, "Fill", "" },
- { GPBRUSH_ERASE_SOFT, "SOFT", ICON_GPBRUSH_ERASE_SOFT, "Eraser Soft", "" },
- { GPBRUSH_ERASE_HARD, "HARD", ICON_GPBRUSH_ERASE_HARD, "Eraser Hard", "" },
- { GPBRUSH_ERASE_STROKE, "STROKE", ICON_GPBRUSH_ERASE_STROKE, "Eraser Stroke", "" },
+ { GP_BRUSH_ICON_PENCIL, "PENCIL", ICON_GPBRUSH_PENCIL, "Pencil", "" },
+ { GP_BRUSH_ICON_PEN, "PEN", ICON_GPBRUSH_PEN, "Pen", "" },
+ { GP_BRUSH_ICON_INK, "INK", ICON_GPBRUSH_INK, "Ink", "" },
+ { GP_BRUSH_ICON_INKNOISE, "INKNOISE", ICON_GPBRUSH_INKNOISE, "Ink Noise", "" },
+ { GP_BRUSH_ICON_BLOCK, "BLOCK", ICON_GPBRUSH_BLOCK, "Block", "" },
+ { GP_BRUSH_ICON_MARKER, "MARKER", ICON_GPBRUSH_MARKER, "Marker", "" },
+ { GP_BRUSH_ICON_FILL, "FILL", ICON_GPBRUSH_FILL, "Fill", "" },
+ { GP_BRUSH_ICON_ERASE_SOFT, "SOFT", ICON_GPBRUSH_ERASE_SOFT, "Eraser Soft", "" },
+ { GP_BRUSH_ICON_ERASE_HARD, "HARD", ICON_GPBRUSH_ERASE_HARD, "Eraser Hard", "" },
+ { GP_BRUSH_ICON_ERASE_STROKE, "STROKE", ICON_GPBRUSH_ERASE_STROKE, "Eraser Stroke", "" },
{ 0, NULL, 0, NULL, NULL }
};
#endif
@@ -684,16 +684,16 @@ static void rna_brush_gpencil_eraser_mode(Main *UNUSED(bmain), Scene *scene, Poi
if ((brush) && (brush->gp_brush_type == GP_BRUSH_TYPE_ERASE)) {
switch (brush->gp_eraser_mode) {
case GP_BRUSH_ERASER_SOFT:
- brush->gp_icon_id = GPBRUSH_ERASE_SOFT;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_SOFT;
break;
case GP_BRUSH_ERASER_HARD:
- brush->gp_icon_id = GPBRUSH_ERASE_HARD;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_HARD;
break;
case GP_BRUSH_ERASER_STROKE:
- brush->gp_icon_id = GPBRUSH_ERASE_STROKE;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_STROKE;
break;
default:
- brush->gp_icon_id = GPBRUSH_ERASE_SOFT;
+ brush->gp_icon_id = GP_BRUSH_ICON_ERASE_SOFT;
break;
}
}
More information about the Bf-blender-cvs
mailing list