diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_datafiles.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 8 |
4 files changed, 18 insertions, 0 deletions
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; |