[Bf-blender-cvs] [a817613be5a] blender2.8: Cleanup: remove unused brushes

[Campbell Barton]

Commit: a817613be5ab1545b000e9173a8d3079aaaefa01
Author: Campbell Barton
Date:   Tue Nov 6 18:21:18 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa817613be5ab1545b000e9173a8d3079aaaefa01

Cleanup: remove unused brushes

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

D	release/datafiles/brushicons/add.png
D	release/datafiles/brushicons/darken.png
D	release/datafiles/brushicons/lighten.png
D	release/datafiles/brushicons/subtract.png
D	release/datafiles/brushicons/vertexdraw.png
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/interface/interface_icons.c

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

diff --git a/release/datafiles/brushicons/add.png b/release/datafiles/brushicons/add.png
deleted file mode 100644
index 1343f7542b8..00000000000
Binary files a/release/datafiles/brushicons/add.png and /dev/null differ
diff --git a/release/datafiles/brushicons/darken.png b/release/datafiles/brushicons/darken.png
deleted file mode 100644
index b129bd7bbea..00000000000
Binary files a/release/datafiles/brushicons/darken.png and /dev/null differ
diff --git a/release/datafiles/brushicons/lighten.png b/release/datafiles/brushicons/lighten.png
deleted file mode 100644
index 9667c9973e4..00000000000
Binary files a/release/datafiles/brushicons/lighten.png and /dev/null differ
diff --git a/release/datafiles/brushicons/subtract.png b/release/datafiles/brushicons/subtract.png
deleted file mode 100644
index cd2a64a819c..00000000000
Binary files a/release/datafiles/brushicons/subtract.png and /dev/null differ
diff --git a/release/datafiles/brushicons/vertexdraw.png b/release/datafiles/brushicons/vertexdraw.png
deleted file mode 100644
index 88a9fbb2b60..00000000000
Binary files a/release/datafiles/brushicons/vertexdraw.png and /dev/null differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 16c01b54497..ed8cc8d71b2 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -766,24 +766,20 @@ if(WITH_BLENDER)
 		data_to_c_simple(../../../../release/datafiles/prvicons.png SRC)
 
 		# brushes
-		data_to_c_simple(../../../../release/datafiles/brushicons/add.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/blob.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/blur.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/clay.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/claystrips.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/clone.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/crease.png SRC)
-		data_to_c_simple(../../../../release/datafiles/brushicons/darken.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/draw.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/fill.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/flatten.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/grab.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/inflate.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/layer.png SRC)
-		data_to_c_simple(../../../../release/datafiles/brushicons/lighten.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/mask.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/mix.png SRC)
-		data_to_c_simple(../../../../release/datafiles/brushicons/multiply.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/nudge.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/pinch.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/scrape.png SRC)
@@ -791,13 +787,11 @@ if(WITH_BLENDER)
 		data_to_c_simple(../../../../release/datafiles/brushicons/smooth.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/snake_hook.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/soften.png SRC)
-		data_to_c_simple(../../../../release/datafiles/brushicons/subtract.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/texdraw.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/texfill.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/texmask.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/thumb.png SRC)
 		data_to_c_simple(../../../../release/datafiles/brushicons/twist.png SRC)
-		data_to_c_simple(../../../../release/datafiles/brushicons/vertexdraw.png SRC)
 
 		# grease pencil sculpt
 		data_to_c_simple(../../../../release/datafiles/brushicons/gp_brush_smooth.png SRC)
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 80c62a3eda7..cae7f2a05c4 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -486,24 +486,20 @@ static void init_brush_icons(void)
 
 	const int w = 96; /* warning, brush size hardcoded in C, but it gets scaled */
 
-	INIT_BRUSH_ICON(ICON_BRUSH_ADD, add);
 	INIT_BRUSH_ICON(ICON_BRUSH_BLOB, blob);
 	INIT_BRUSH_ICON(ICON_BRUSH_BLUR, blur);
 	INIT_BRUSH_ICON(ICON_BRUSH_CLAY, clay);
 	INIT_BRUSH_ICON(ICON_BRUSH_CLAY_STRIPS, claystrips);
 	INIT_BRUSH_ICON(ICON_BRUSH_CLONE, clone);
 	INIT_BRUSH_ICON(ICON_BRUSH_CREASE, crease);
-	INIT_BRUSH_ICON(ICON_BRUSH_DARKEN, darken);
 	INIT_BRUSH_ICON(ICON_BRUSH_SCULPT_DRAW, draw);
 	INIT_BRUSH_ICON(ICON_BRUSH_FILL, fill);
 	INIT_BRUSH_ICON(ICON_BRUSH_FLATTEN, flatten);
 	INIT_BRUSH_ICON(ICON_BRUSH_GRAB, grab);
 	INIT_BRUSH_ICON(ICON_BRUSH_INFLATE, inflate);
 	INIT_BRUSH_ICON(ICON_BRUSH_LAYER, layer);
-	INIT_BRUSH_ICON(ICON_BRUSH_LIGHTEN, lighten);
 	INIT_BRUSH_ICON(ICON_BRUSH_MASK, mask);
 	INIT_BRUSH_ICON(ICON_BRUSH_MIX, mix);
-	INIT_BRUSH_ICON(ICON_BRUSH_MULTIPLY, multiply);
 	INIT_BRUSH_ICON(ICON_BRUSH_NUDGE, nudge);
 	INIT_BRUSH_ICON(ICON_BRUSH_PINCH, pinch);
 	INIT_BRUSH_ICON(ICON_BRUSH_SCRAPE, scrape);
@@ -511,13 +507,11 @@ static void init_brush_icons(void)
 	INIT_BRUSH_ICON(ICON_BRUSH_SMOOTH, smooth);
 	INIT_BRUSH_ICON(ICON_BRUSH_SNAKE_HOOK, snake_hook);
 	INIT_BRUSH_ICON(ICON_BRUSH_SOFTEN, soften);
-	INIT_BRUSH_ICON(ICON_BRUSH_SUBTRACT, subtract);
 	INIT_BRUSH_ICON(ICON_BRUSH_TEXDRAW, texdraw);
 	INIT_BRUSH_ICON(ICON_BRUSH_TEXFILL, texfill);
 	INIT_BRUSH_ICON(ICON_BRUSH_TEXMASK, texmask);
 	INIT_BRUSH_ICON(ICON_BRUSH_THUMB, thumb);
 	INIT_BRUSH_ICON(ICON_BRUSH_ROTATE, twist);
-	INIT_BRUSH_ICON(ICON_BRUSH_VERTEXDRAW, vertexdraw);
 
 	/* grease pencil sculpt */
 	INIT_BRUSH_ICON(ICON_GPBRUSH_SMOOTH, gp_brush_smooth);