[Bf-blender-cvs] [b9e919b0033] blender2.8: Icons: remove unused vertex paint icons

Campbell Barton noreply at git.blender.org
Wed Nov 7 02:57:46 CET 2018


Commit: b9e919b00337093cbbf2c0c2c68861fc568d9ff4
Author: Campbell Barton
Date:   Wed Nov 7 12:43:09 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBb9e919b00337093cbbf2c0c2c68861fc568d9ff4

Icons: remove unused vertex paint icons

Also update names to match enum.

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

R100	release/datafiles/icons/brush.vertex.average.dat	release/datafiles/icons/brush.paint_vertex.average.dat
R100	release/datafiles/icons/brush.paint_vertex.mix.dat	release/datafiles/icons/brush.paint_vertex.draw.dat
D	release/datafiles/icons/brush.paint_weight.darken.dat
D	release/datafiles/icons/brush.paint_weight.lighten.dat
M	release/datafiles/icons/brush.paint_weight.mix.dat
D	release/datafiles/icons/brush.paint_weight.multiply.dat
D	release/datafiles/icons/brush.weight.add.dat
D	release/datafiles/icons/brush.weight.subtract.dat
M	source/blender/editors/datafiles/CMakeLists.txt

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

diff --git a/release/datafiles/icons/brush.vertex.average.dat b/release/datafiles/icons/brush.paint_vertex.average.dat
similarity index 100%
rename from release/datafiles/icons/brush.vertex.average.dat
rename to release/datafiles/icons/brush.paint_vertex.average.dat
diff --git a/release/datafiles/icons/brush.paint_vertex.mix.dat b/release/datafiles/icons/brush.paint_vertex.draw.dat
similarity index 100%
rename from release/datafiles/icons/brush.paint_vertex.mix.dat
rename to release/datafiles/icons/brush.paint_vertex.draw.dat
diff --git a/release/datafiles/icons/brush.paint_weight.darken.dat b/release/datafiles/icons/brush.paint_weight.darken.dat
deleted file mode 100644
index 382ee47b180..00000000000
Binary files a/release/datafiles/icons/brush.paint_weight.darken.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.paint_weight.lighten.dat b/release/datafiles/icons/brush.paint_weight.lighten.dat
deleted file mode 100644
index 0621806f077..00000000000
Binary files a/release/datafiles/icons/brush.paint_weight.lighten.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.paint_weight.mix.dat b/release/datafiles/icons/brush.paint_weight.mix.dat
index 0a9fc5b2905..0366235c11f 100644
Binary files a/release/datafiles/icons/brush.paint_weight.mix.dat and b/release/datafiles/icons/brush.paint_weight.mix.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.multiply.dat b/release/datafiles/icons/brush.paint_weight.multiply.dat
deleted file mode 100644
index dcd6f8bca99..00000000000
Binary files a/release/datafiles/icons/brush.paint_weight.multiply.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.weight.add.dat b/release/datafiles/icons/brush.weight.add.dat
deleted file mode 100644
index 6fff2232911..00000000000
Binary files a/release/datafiles/icons/brush.weight.add.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.weight.subtract.dat b/release/datafiles/icons/brush.weight.subtract.dat
deleted file mode 100644
index e0f21056cc8..00000000000
Binary files a/release/datafiles/icons/brush.weight.subtract.dat and /dev/null differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index ed8cc8d71b2..cc2ef1d7253 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -617,8 +617,9 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
 	brush.paint_texture.smear
 	brush.paint_texture.soften
 	brush.paint_vertex.alpha
+	brush.paint_vertex.average
 	brush.paint_vertex.blur
-	brush.paint_vertex.mix
+	brush.paint_vertex.draw
 	brush.paint_vertex.smear
 	brush.paint_weight.blur
 	brush.paint_weight.darken
@@ -651,7 +652,6 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
 	brush.sculpt.smooth
 	brush.sculpt.snake_hook
 	brush.sculpt.thumb
-	brush.vertex.average
 	brush.weight.add
 	brush.weight.subtract
 	none



More information about the Bf-blender-cvs mailing list