[Bf-blender-cvs] [2241f14e262] blender2.8: Icons: add texture paint icons

Campbell Barton noreply at git.blender.org
Sat May 5 18:04:56 CEST 2018


Commit: 2241f14e2629d0202a38ea8ed066affd07bb6da3
Author: Campbell Barton
Date:   Sat May 5 18:01:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2241f14e2629d0202a38ea8ed066affd07bb6da3

Icons: add texture paint icons

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

A	release/datafiles/icons/brush.paint_texture.airbrush.dat
A	release/datafiles/icons/brush.paint_texture.clone.dat
M	release/datafiles/icons/brush.paint_texture.draw.dat
A	release/datafiles/icons/brush.paint_texture.fill.dat
A	release/datafiles/icons/brush.paint_texture.mask.dat
A	release/datafiles/icons/brush.paint_texture.multiply.dat
A	release/datafiles/icons/brush.paint_texture.smear.dat
A	release/datafiles/icons/brush.paint_texture.soften.dat
M	release/datafiles/icons/brush.paint_vertex.blur.dat
M	release/datafiles/icons/ops.generic.cursor.dat
M	release/datafiles/icons/ops.generic.select_border.dat
M	release/datafiles/icons/ops.generic.select_circle.dat
M	release/datafiles/icons/ops.generic.select_lasso.dat
M	release/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat
M	release/datafiles/icons/ops.mesh.spin.dat
M	release/datafiles/icons/ops.mesh.spin.duplicate.dat
A	release/datafiles/icons/ops.paint.vertex_color_fill.dat
A	release/datafiles/icons/ops.paint.weight_fill.dat
M	release/datafiles/icons/ops.paint.weight_gradient.dat
M	source/blender/editors/datafiles/CMakeLists.txt

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

diff --git a/release/datafiles/icons/brush.paint_texture.airbrush.dat b/release/datafiles/icons/brush.paint_texture.airbrush.dat
new file mode 100644
index 00000000000..f1ca6a9ed9e
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.airbrush.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat
new file mode 100644
index 00000000000..2414e98343c
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.clone.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat b/release/datafiles/icons/brush.paint_texture.draw.dat
index f5de7a81341..fdd029d1f52 100644
Binary files a/release/datafiles/icons/brush.paint_texture.draw.dat and b/release/datafiles/icons/brush.paint_texture.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat b/release/datafiles/icons/brush.paint_texture.fill.dat
new file mode 100644
index 00000000000..675c8565bac
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.fill.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat b/release/datafiles/icons/brush.paint_texture.mask.dat
new file mode 100644
index 00000000000..0e4674fcd49
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.mask.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat b/release/datafiles/icons/brush.paint_texture.multiply.dat
similarity index 66%
copy from release/datafiles/icons/brush.paint_texture.draw.dat
copy to release/datafiles/icons/brush.paint_texture.multiply.dat
index f5de7a81341..68331f8abfa 100644
Binary files a/release/datafiles/icons/brush.paint_texture.draw.dat and b/release/datafiles/icons/brush.paint_texture.multiply.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat
new file mode 100644
index 00000000000..4bf17036b19
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.smear.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.soften.dat b/release/datafiles/icons/brush.paint_texture.soften.dat
new file mode 100644
index 00000000000..74ee7273c9a
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.soften.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat b/release/datafiles/icons/brush.paint_vertex.blur.dat
index 1d02bde996f..8fbe8153259 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.blur.dat and b/release/datafiles/icons/brush.paint_vertex.blur.dat differ
diff --git a/release/datafiles/icons/ops.generic.cursor.dat b/release/datafiles/icons/ops.generic.cursor.dat
index 4bf8fb02c7e..67ee3a9af04 100644
Binary files a/release/datafiles/icons/ops.generic.cursor.dat and b/release/datafiles/icons/ops.generic.cursor.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_border.dat b/release/datafiles/icons/ops.generic.select_border.dat
index f2a3b1c9998..f8a0051391c 100644
Binary files a/release/datafiles/icons/ops.generic.select_border.dat and b/release/datafiles/icons/ops.generic.select_border.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_circle.dat b/release/datafiles/icons/ops.generic.select_circle.dat
index 385edd919a6..eb08a38c499 100644
Binary files a/release/datafiles/icons/ops.generic.select_circle.dat and b/release/datafiles/icons/ops.generic.select_circle.dat differ
diff --git a/release/datafiles/icons/ops.generic.select_lasso.dat b/release/datafiles/icons/ops.generic.select_lasso.dat
index b9dfc3148f6..8f8722b5f3d 100644
Binary files a/release/datafiles/icons/ops.generic.select_lasso.dat and b/release/datafiles/icons/ops.generic.select_lasso.dat differ
diff --git a/release/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat b/release/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat
index c9c3292e9df..7f0b3ee0ced 100644
Binary files a/release/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat and b/release/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat differ
diff --git a/release/datafiles/icons/ops.mesh.spin.dat b/release/datafiles/icons/ops.mesh.spin.dat
index f7e6a7ac454..26d49086a03 100644
Binary files a/release/datafiles/icons/ops.mesh.spin.dat and b/release/datafiles/icons/ops.mesh.spin.dat differ
diff --git a/release/datafiles/icons/ops.mesh.spin.duplicate.dat b/release/datafiles/icons/ops.mesh.spin.duplicate.dat
index fdae40e7f3f..e8bcfa7587c 100644
Binary files a/release/datafiles/icons/ops.mesh.spin.duplicate.dat and b/release/datafiles/icons/ops.mesh.spin.duplicate.dat differ
diff --git a/release/datafiles/icons/ops.paint.vertex_color_fill.dat b/release/datafiles/icons/ops.paint.vertex_color_fill.dat
new file mode 100644
index 00000000000..be3d2bc24ee
Binary files /dev/null and b/release/datafiles/icons/ops.paint.vertex_color_fill.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat
new file mode 100644
index 00000000000..73545dee4d9
Binary files /dev/null and b/release/datafiles/icons/ops.paint.weight_fill.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_gradient.dat b/release/datafiles/icons/ops.paint.weight_gradient.dat
index 506672e88af..64d4012e59b 100644
Binary files a/release/datafiles/icons/ops.paint.weight_gradient.dat and b/release/datafiles/icons/ops.paint.weight_gradient.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 573f00ce738..3ebf3c60ab2 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -528,7 +528,14 @@ set(ICON_NAMES
 # This section is maintained by the updating script, keep BEGIN/END comments.
 set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
 	# BEGIN ICON_GEOM_NAMES
+	brush.paint_texture.airbrush
+	brush.paint_texture.clone
 	brush.paint_texture.draw
+	brush.paint_texture.fill
+	brush.paint_texture.mask
+	brush.paint_texture.multiply
+	brush.paint_texture.smear
+	brush.paint_texture.soften
 	brush.paint_vertex.alpha
 	brush.paint_vertex.blur
 	brush.paint_vertex.mix
@@ -583,6 +590,8 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
 	ops.mesh.spin
 	ops.mesh.spin.duplicate
 	ops.mesh.vertices_smooth
+	ops.paint.vertex_color_fill
+	ops.paint.weight_fill
 	ops.paint.weight_gradient
 	ops.transform.edge_slide
 	ops.transform.push_pull



More information about the Bf-blender-cvs mailing list