[Bf-blender-cvs] [fc18bfc5329] greasepencil-object: UI: Replace Eraser icons

[Antonio Vazquez]

Commit: fc18bfc532909cb3e562bd21fe7eedac7245ce19
Author: Antonio Vazquez
Date:   Wed Mar 21 19:44:13 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBfc18bfc532909cb3e562bd21fe7eedac7245ce19

UI: Replace Eraser icons

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

A	release/datafiles/brushicons/gp_brush_erase_hard.png
M	release/datafiles/brushicons/gp_brush_erase_soft.png
A	release/datafiles/brushicons/gp_brush_erase_stroke.png
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/include/ED_datafiles.h
M	source/blender/editors/interface/interface_icons.c

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

diff --git a/release/datafiles/brushicons/gp_brush_erase_soft.png b/release/datafiles/brushicons/gp_brush_erase_hard.png
similarity index 100%
copy from release/datafiles/brushicons/gp_brush_erase_soft.png
copy to release/datafiles/brushicons/gp_brush_erase_hard.png
diff --git a/release/datafiles/brushicons/gp_brush_erase_soft.png b/release/datafiles/brushicons/gp_brush_erase_soft.png
index 2ac52840678..416923004dd 100644
Binary files a/release/datafiles/brushicons/gp_brush_erase_soft.png and b/release/datafiles/brushicons/gp_brush_erase_soft.png differ
diff --git a/release/datafiles/brushicons/gp_brush_erase_stroke.png b/release/datafiles/brushicons/gp_brush_erase_stroke.png
new file mode 100644
index 00000000000..cd6d21532cf
Binary files /dev/null and b/release/datafiles/brushicons/gp_brush_erase_stroke.png differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index a804c587a5e..87cb5d75795 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -640,6 +640,8 @@ if(WITH_BLENDER)
 		data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_custom.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_fill.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)
 
 	endif()
 
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 4ef677b65bc..fbf00020da2 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -298,5 +298,11 @@ extern char datatoc_gp_brush_fill_png[];
 extern int datatoc_gp_brush_erase_soft_png_size;
 extern char datatoc_gp_brush_erase_soft_png[];
 
+extern int datatoc_gp_brush_erase_hard_png_size;
+extern char datatoc_gp_brush_erase_hard_png[];
+
+extern int datatoc_gp_brush_erase_stroke_png_size;
+extern char datatoc_gp_brush_erase_stroke_png[];
+
 #endif /* __ED_DATAFILES_H__ */
 
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index fabee96f9dd..160a34d482c 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -441,10 +441,9 @@ static void init_brush_icons(void)
 	INIT_BRUSH_ICON(ICON_GPBRUSH_MARKER, gp_brush_marker);
 	INIT_BRUSH_ICON(ICON_GPBRUSH_CUSTOM, gp_brush_custom);
 	INIT_BRUSH_ICON(ICON_GPBRUSH_FILL, gp_brush_fill);
-	/* Use same png for 3 eraser brusehs while decide new design */
 	INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_SOFT, gp_brush_erase_soft);
-	INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_HARD, gp_brush_erase_soft);
-	INIT_BRUSH_ICON(ICON_GPBRUSH_ERASE_STROKE, 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);
 
 #undef INIT_BRUSH_ICON
 }