[Bf-blender-cvs] [09f376ad8d7] greasepencil-object: New full set of Brush icons
Antonio Vazquez
noreply at git.blender.org
Sun Jan 14 11:10:28 CET 2018
Commit: 09f376ad8d7dd0fa941465451e65769cf312c9c8
Author: Antonio Vazquez
Date: Sun Jan 14 11:10:21 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB09f376ad8d7dd0fa941465451e65769cf312c9c8
New full set of Brush icons
Icons designed by Matias Mendiola
===================================================================
A release/datafiles/brushicons/gp_brush_block.png
A release/datafiles/brushicons/gp_brush_custom.png
D release/datafiles/brushicons/gp_brush_draw.png
M release/datafiles/brushicons/gp_brush_fill.png
A release/datafiles/brushicons/gp_brush_ink.png
A release/datafiles/brushicons/gp_brush_inknoise.png
A release/datafiles/brushicons/gp_brush_marker.png
A release/datafiles/brushicons/gp_brush_pen.png
A release/datafiles/brushicons/gp_brush_pencil.png
M source/blender/blenkernel/intern/gpencil.c
M source/blender/editors/datafiles/CMakeLists.txt
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/include/ED_datafiles.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface_icons.c
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/datafiles/brushicons/gp_brush_block.png b/release/datafiles/brushicons/gp_brush_block.png
new file mode 100644
index 00000000000..8712e4dd5ba
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_block.png differ
diff --git a/release/datafiles/brushicons/gp_brush_custom.png b/release/datafiles/brushicons/gp_brush_custom.png
new file mode 100644
index 00000000000..73b053b4f7a
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_custom.png differ
diff --git a/release/datafiles/brushicons/gp_brush_draw.png b/release/datafiles/brushicons/gp_brush_draw.png
deleted file mode 100644
index 4e7620bcd78..00000000000
Binary files a/release/datafiles/brushicons/gp_brush_draw.png and /dev/null differ
diff --git a/release/datafiles/brushicons/gp_brush_fill.png b/release/datafiles/brushicons/gp_brush_fill.png
index 5cf49058900..187896a22f4 100644
Binary files a/release/datafiles/brushicons/gp_brush_fill.png and b/release/datafiles/brushicons/gp_brush_fill.png differ
diff --git a/release/datafiles/brushicons/gp_brush_ink.png b/release/datafiles/brushicons/gp_brush_ink.png
new file mode 100644
index 00000000000..a9c7e79921c
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_ink.png differ
diff --git a/release/datafiles/brushicons/gp_brush_inknoise.png b/release/datafiles/brushicons/gp_brush_inknoise.png
new file mode 100644
index 00000000000..3bf6df17bdc
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_inknoise.png differ
diff --git a/release/datafiles/brushicons/gp_brush_marker.png b/release/datafiles/brushicons/gp_brush_marker.png
new file mode 100644
index 00000000000..e467a716362
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_marker.png differ
diff --git a/release/datafiles/brushicons/gp_brush_pen.png b/release/datafiles/brushicons/gp_brush_pen.png
new file mode 100644
index 00000000000..d183e90da99
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_pen.png differ
diff --git a/release/datafiles/brushicons/gp_brush_pencil.png b/release/datafiles/brushicons/gp_brush_pencil.png
new file mode 100644
index 00000000000..e931d33c3bb
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_pencil.png differ
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 8b6b658ebc1..330f765f60c 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -586,7 +586,8 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
-
+ brush->icon = GPBRUSH_PENCIL;
+
/* Pen brush */
brush = BKE_gpencil_brush_addnew(ts, "Pen", true);
brush->thickness = 30.0f;
@@ -612,6 +613,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->thick_smoothlvl = 3;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_PEN;
/* Ink brush */
brush = BKE_gpencil_brush_addnew(ts, "Ink", true);
@@ -636,6 +638,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_INK;
/* Curve */
custom_curve = brush->cur_sensitivity;
@@ -666,6 +669,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_INKNOISE;
/* Curve */
custom_curve = brush->cur_sensitivity;
@@ -697,6 +701,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 0;
brush->draw_random_sub = 0;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_BLOCK;
/* Marker brush */
brush = BKE_gpencil_brush_addnew(ts, "Marker", false);
@@ -721,6 +726,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_MARKER;
/* Experimental brush */
brush = BKE_gpencil_brush_addnew(ts, "Experimental", false);
@@ -746,6 +752,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->sublevel = 3;
brush->draw_random_sub = 0;
copy_v3_v3(brush->curcolor, curcolor);
+ brush->icon = GPBRUSH_CUSTOM;
/* Fill brush */
brush = BKE_gpencil_brush_addnew(ts, "Fill", false);
@@ -755,6 +762,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->fill_leak = 3;
brush->fill_threshold = 0.1f;
brush->fill_simplylvl = 1;
+ brush->icon = GPBRUSH_FILL;
brush->draw_strength = 1.0f;
copy_v3_v3(brush->curcolor, curcolor);
@@ -785,6 +793,7 @@ bGPDbrush *BKE_gpencil_brush_addnew(ToolSettings *ts, const char *name, bool set
brush->draw_strength = 1.0f;
brush->draw_jitter = 0.0f;
brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->icon = GPBRUSH_CUSTOM;
/* curves */
brush->cur_sensitivity = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index f8c7a26051e..303c750083a 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -137,7 +137,13 @@ if(WITH_BLENDER)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_clone.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_weight.png SRC)
- data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_draw.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_pencil.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_pen.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_ink.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_inknoise.png SRC)
+ 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_custom.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_fill.png SRC)
endif()
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 25b92246e53..15ff2efdada 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -953,7 +953,7 @@ const EnumPropertyItem *ED_gpencil_brushes_enum_itemf(
item_tmp.icon = ICON_GPBRUSH_FILL;
}
else {
- item_tmp.icon = ICON_GPBRUSH_DRAW;
+ item_tmp.icon = gpencil_get_brush_icon(brush->icon);
}
else
item_tmp.icon = ICON_NONE;
@@ -1447,3 +1447,37 @@ void gp_stroke_convertcoords_tpoint(Scene *scene, ARegion *ar, View3D *v3d,
zero_v3(out);
}
}
+
+/* helper to get brush icon */
+int gpencil_get_brush_icon(int type)
+{
+ switch (type) {
+ case GPBRUSH_CUSTOM:
+ return ICON_GPBRUSH_CUSTOM;
+ break;
+ case GPBRUSH_PENCIL:
+ return ICON_GPBRUSH_PENCIL;
+ break;
+ case GPBRUSH_PEN:
+ return ICON_GPBRUSH_PEN;
+ break;
+ case GPBRUSH_INK:
+ return ICON_GPBRUSH_INK;
+ break;
+ case GPBRUSH_INKNOISE:
+ return ICON_GPBRUSH_INKNOISE;
+ break;
+ case GPBRUSH_BLOCK:
+ return ICON_GPBRUSH_BLOCK;
+ break;
+ case GPBRUSH_MARKER:
+ return ICON_GPBRUSH_MARKER;
+ break;
+ case GPBRUSH_FILL:
+ return ICON_GPBRUSH_FILL;
+ break;
+ default:
+ return ICON_GPBRUSH_CUSTOM;
+ break;
+ }
+}
\ No newline at end of file
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 6553e79d66e..996d1ad76f0 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -271,8 +271,26 @@ extern char datatoc_gp_brush_clone_png[];
extern int datatoc_gp_brush_weight_png_size;
extern char datatoc_gp_brush_weight_png[];
-extern int datatoc_gp_brush_draw_png_size;
-extern char datatoc_gp_brush_draw_png[];
+extern int datatoc_gp_brush_pencil_png_size;
+extern char datatoc_gp_brush_pencil_png[];
+
+extern int datatoc_gp_brush_pen_png_size;
+extern char datatoc_gp_brush_pen_png[];
+
+extern int datatoc_gp_brush_ink_png_size;
+extern char datatoc_gp_brush_ink_png[];
+
+extern int datatoc_gp_brush_inknoise_png_size;
+extern char datatoc_gp_brush_inknoise_png[];
+
+extern int datatoc_gp_brush_block_png_size;
+extern char datatoc_gp_brush_block_png[];
+
+extern int datatoc_gp_brush_marker_png_size;
+extern char datatoc_gp_brush_marker_png[];
+
+extern int datatoc_gp_brush_custom_png_size;
+extern char datatoc_gp_brush_custom_png[];
extern int datatoc_gp_brush_fill_png_size;
extern char datatoc_gp_brush_fill_png[];
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index d3daa0a49af..9c2ddd0313d 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -371,4 +371,8 @@ void ED_gpencil_vgroup_deselect(struct bContext *C, struct Object *ob);
/* join objects */
int ED_gpencil_join_objects_exec(struct bContext *C, struct wmOperator *op);
+
+/* helper to get brush icon */
+int gpencil_get_brush_icon(int type);
+
#endif /* __ED_GPENCIL_H__ */
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 00e2bd618d2..a72de3a26c8 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -1013,7 +1013,14 @@ DEF_ICON(GPBRUSH_PINCH)
DEF_ICON(GPBRUSH_RANDOMIZE)
DEF_ICON(GPBRUSH_CLONE)
DEF_ICON(GPBRUSH_WEIGHT)
-DEF_ICON(GPBRUSH_DRAW)
+
+DEF_ICON(GPBRUSH_PENCIL)
+DEF_ICON(GPBRUSH_PEN)
+DEF_ICON(GPBRUSH_INK)
+DEF_ICON(GPBRUSH_INKNOISE)
+DEF_ICON(GPBRUSH_BLOCK)
+DEF_ICON(GPBRUSH_MARKER)
+DEF_ICON(GPBRUSH_CUSTOM)
DEF_ICON(GPBRUSH_FILL)
/* vector icons, VICO_ prefix added */
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 01f44aa21d7..89e9e10f487 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list