[Bf-blender-cvs] [d7f594ae3a3] master: GPencil: New set of Brush icons
Antonio Vazquez
noreply at git.blender.org
Thu Sep 12 22:18:20 CEST 2019
Commit: d7f594ae3a33b4117466f945b98b4bcfe03a644f
Author: Antonio Vazquez
Date: Thu Sep 12 13:34:19 2019 +0200
Branches: master
https://developer.blender.org/rBd7f594ae3a33b4117466f945b98b4bcfe03a644f
GPencil: New set of Brush icons
Added: Airbrush and Chisel
Changed: Marker
Design: @mendio
Subscribers: mendio
Differential Revision: https://developer.blender.org/D5774
===================================================================
A release/datafiles/brushicons/gp_brush_airbrush.png
A release/datafiles/brushicons/gp_brush_chisel.png
M release/datafiles/brushicons/gp_brush_marker.png
M source/blender/editors/datafiles/CMakeLists.txt
M source/blender/editors/include/ED_datafiles.h
M source/blender/editors/include/UI_icons.h
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/release/datafiles/brushicons/gp_brush_airbrush.png b/release/datafiles/brushicons/gp_brush_airbrush.png
new file mode 100644
index 00000000000..3c9aa4273bf
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_airbrush.png differ
diff --git a/release/datafiles/brushicons/gp_brush_chisel.png b/release/datafiles/brushicons/gp_brush_chisel.png
new file mode 100644
index 00000000000..6fa5071e9be
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_chisel.png differ
diff --git a/release/datafiles/brushicons/gp_brush_marker.png b/release/datafiles/brushicons/gp_brush_marker.png
index c7a62b78ca7..35a6f38280f 100644
Binary files a/release/datafiles/brushicons/gp_brush_marker.png and b/release/datafiles/brushicons/gp_brush_marker.png differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 69738d2e008..765362b374e 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -836,6 +836,8 @@ if(WITH_BLENDER)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_block.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_marker.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_fill.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_airbrush.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_chisel.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_erase_soft.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_erase_hard.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_erase_stroke.png SRC)
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 43d7117a1b2..ada90205b4a 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -285,6 +285,12 @@ extern char datatoc_gp_brush_marker_png[];
extern int datatoc_gp_brush_fill_png_size;
extern char datatoc_gp_brush_fill_png[];
+extern int datatoc_gp_brush_airbrush_png_size;
+extern char datatoc_gp_brush_airbrush_png[];
+
+extern int datatoc_gp_brush_chisel_png_size;
+extern char datatoc_gp_brush_chisel_png[];
+
extern int datatoc_gp_brush_erase_soft_png_size;
extern char datatoc_gp_brush_erase_soft_png[];
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index dd052a8256b..ffabace48c0 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -937,6 +937,8 @@ DEF_ICON_COLOR(GPBRUSH_INKNOISE)
DEF_ICON_COLOR(GPBRUSH_BLOCK)
DEF_ICON_COLOR(GPBRUSH_MARKER)
DEF_ICON_COLOR(GPBRUSH_FILL)
+DEF_ICON_COLOR(GPBRUSH_AIRBRUSH)
+DEF_ICON_COLOR(GPBRUSH_CHISEL)
DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT)
DEF_ICON_COLOR(GPBRUSH_ERASE_HARD)
DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE)
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 085ae5bdb93..bbf55dc2213 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -554,6 +554,8 @@ static void init_brush_icons(void)
INIT_BRUSH_ICON(ICON_GPBRUSH_BLOCK, gp_brush_block);
INIT_BRUSH_ICON(ICON_GPBRUSH_MARKER, gp_brush_marker);
INIT_BRUSH_ICON(ICON_GPBRUSH_FILL, gp_brush_fill);
+ INIT_BRUSH_ICON(ICON_GPBRUSH_AIRBRUSH, gp_brush_airbrush);
+ INIT_BRUSH_ICON(ICON_GPBRUSH_CHISEL, gp_brush_chisel);
INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_SOFT, gp_brush_erase_soft);
INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_HARD, gp_brush_erase_hard);
INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_STROKE, gp_brush_erase_stroke);
@@ -2060,6 +2062,12 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
case GP_BRUSH_ICON_FILL:
br->id.icon_id = ICON_GPBRUSH_FILL;
break;
+ case GP_BRUSH_ICON_AIRBRUSH:
+ br->id.icon_id = ICON_GPBRUSH_AIRBRUSH;
+ break;
+ case GP_BRUSH_ICON_CHISEL:
+ br->id.icon_id = ICON_GPBRUSH_CHISEL;
+ break;
case GP_BRUSH_ICON_ERASE_SOFT:
br->id.icon_id = ICON_GPBRUSH_ERASE_SOFT;
break;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 957f5b75974..a503d3b6739 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -185,6 +185,8 @@ typedef enum eGP_BrushIcons {
GP_BRUSH_ICON_ERASE_SOFT = 8,
GP_BRUSH_ICON_ERASE_HARD = 9,
GP_BRUSH_ICON_ERASE_STROKE = 10,
+ GP_BRUSH_ICON_AIRBRUSH = 11,
+ GP_BRUSH_ICON_CHISEL = 12,
} eGP_BrushIcons;
typedef enum eBrushCurvePreset {
@@ -512,7 +514,7 @@ typedef enum eBrushUVSculptTool {
SCULPT_TOOL_ELASTIC_DEFORM, \
SCULPT_TOOL_POSE, \
\
- /* These brushes could handle dynamic topology, \
+ /* These brushes could handle dynamic topology, \ \
* but user feedback indicates it's better not to */ \
SCULPT_TOOL_SMOOTH, \
SCULPT_TOOL_MASK) == 0)
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 9be64a44414..716e8526071 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -170,6 +170,8 @@ static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = {
{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_AIRBRUSH, "AIRBRUSH", ICON_GPBRUSH_AIRBRUSH, "Airbrush", ""},
+ {GP_BRUSH_ICON_CHISEL, "CHISEL", ICON_GPBRUSH_CHISEL, "Chisel", ""},
{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", ""},
More information about the Bf-blender-cvs
mailing list