[Bf-blender-cvs] [77b925c9f8d] blender2.8: Icons: update to r62155
Campbell Barton
noreply at git.blender.org
Fri Nov 9 07:33:57 CET 2018
Commit: 77b925c9f8d1d7ad91a5be14c22f9bbd483358d1
Author: Campbell Barton
Date: Fri Nov 9 17:31:09 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB77b925c9f8d1d7ad91a5be14c22f9bbd483358d1
Icons: update to r62155
- Tweaked GP toolbar icons and added Line, Rectangle & Circle.
- Added the remaining toolbar icons for all our paint & sculpt modes.
- Made all the toolbar icons the same simple style.
===================================================================
A release/datafiles/icons/brush.gpencil_draw.circle.dat
M release/datafiles/icons/brush.gpencil_draw.draw.dat
M release/datafiles/icons/brush.gpencil_draw.erase.dat
M release/datafiles/icons/brush.gpencil_draw.fill.dat
A release/datafiles/icons/brush.gpencil_draw.line.dat
A release/datafiles/icons/brush.gpencil_draw.rectangle.dat
M release/datafiles/icons/brush.paint_texture.clone.dat
M release/datafiles/icons/brush.paint_texture.draw.dat
M release/datafiles/icons/brush.paint_texture.fill.dat
M release/datafiles/icons/brush.paint_texture.mask.dat
A release/datafiles/icons/brush.paint_texture.masklort.dat
M release/datafiles/icons/brush.paint_texture.smear.dat
M release/datafiles/icons/brush.paint_texture.soften.dat
M release/datafiles/icons/brush.paint_vertex.alpha.dat
M release/datafiles/icons/brush.paint_vertex.average.dat
M release/datafiles/icons/brush.paint_vertex.blur.dat
M release/datafiles/icons/brush.paint_vertex.draw.dat
M release/datafiles/icons/brush.paint_vertex.smear.dat
A release/datafiles/icons/brush.paint_weight.average.dat
M release/datafiles/icons/brush.paint_weight.blur.dat
M release/datafiles/icons/brush.paint_weight.draw.dat
A release/datafiles/icons/brush.paint_weight.smear.dat
A release/datafiles/icons/brush.sculpt.simplify.dat
M release/datafiles/icons/ops.paint.weight_fill.dat
M release/datafiles/icons/ops.paint.weight_gradient.dat
M release/datafiles/icons/ops.paint.weight_sample.dat
A release/datafiles/icons/ops.paint.weight_sample_group.dat
M source/blender/editors/datafiles/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/icons/brush.gpencil_draw.circle.dat b/release/datafiles/icons/brush.gpencil_draw.circle.dat
new file mode 100644
index 00000000000..bdc133c1fbc
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil_draw.circle.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat
index 4643afc07e5..be7e02824c9 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.draw.dat and b/release/datafiles/icons/brush.gpencil_draw.draw.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat
index 3e1b77e4661..d3d1d5a32a6 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.erase.dat and b/release/datafiles/icons/brush.gpencil_draw.erase.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat
index 82e6f6bbac9..4eeb4334ddd 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.fill.dat and b/release/datafiles/icons/brush.gpencil_draw.fill.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.line.dat b/release/datafiles/icons/brush.gpencil_draw.line.dat
new file mode 100644
index 00000000000..153b3120e19
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil_draw.line.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.rectangle.dat b/release/datafiles/icons/brush.gpencil_draw.rectangle.dat
new file mode 100644
index 00000000000..0dabb9271e9
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil_draw.rectangle.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat
index 63070e716ba..a65a2047b71 100644
Binary files a/release/datafiles/icons/brush.paint_texture.clone.dat 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 8aa4d4a1347..6b46c7f3f97 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
index d4089476383..97e8ef27ca1 100644
Binary files a/release/datafiles/icons/brush.paint_texture.fill.dat 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
index a7d6bf0280f..46cfd5499a8 100644
Binary files a/release/datafiles/icons/brush.paint_texture.mask.dat and b/release/datafiles/icons/brush.paint_texture.mask.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.masklort.dat b/release/datafiles/icons/brush.paint_texture.masklort.dat
new file mode 100644
index 00000000000..9d83b50f3de
Binary files /dev/null and b/release/datafiles/icons/brush.paint_texture.masklort.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat
index 071776c2ac1..a38512ce092 100644
Binary files a/release/datafiles/icons/brush.paint_texture.smear.dat 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
index 1f57ab5db3d..445be2dd6ce 100644
Binary files a/release/datafiles/icons/brush.paint_texture.soften.dat and b/release/datafiles/icons/brush.paint_texture.soften.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.alpha.dat b/release/datafiles/icons/brush.paint_vertex.alpha.dat
index f16bd8162ec..e74795dcb9e 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.alpha.dat and b/release/datafiles/icons/brush.paint_vertex.alpha.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.average.dat b/release/datafiles/icons/brush.paint_vertex.average.dat
index b46c54fd4eb..953e29a8bdd 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.average.dat and b/release/datafiles/icons/brush.paint_vertex.average.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat b/release/datafiles/icons/brush.paint_vertex.blur.dat
index 4c517526569..445be2dd6ce 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/brush.paint_vertex.draw.dat b/release/datafiles/icons/brush.paint_vertex.draw.dat
index ac8c3b07141..6b46c7f3f97 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.draw.dat and b/release/datafiles/icons/brush.paint_vertex.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.smear.dat b/release/datafiles/icons/brush.paint_vertex.smear.dat
index 8ce6227be11..a38512ce092 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.smear.dat and b/release/datafiles/icons/brush.paint_vertex.smear.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.average.dat b/release/datafiles/icons/brush.paint_weight.average.dat
new file mode 100644
index 00000000000..953e29a8bdd
Binary files /dev/null and b/release/datafiles/icons/brush.paint_weight.average.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.blur.dat b/release/datafiles/icons/brush.paint_weight.blur.dat
index 8af2e7a2e05..445be2dd6ce 100644
Binary files a/release/datafiles/icons/brush.paint_weight.blur.dat and b/release/datafiles/icons/brush.paint_weight.blur.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.draw.dat b/release/datafiles/icons/brush.paint_weight.draw.dat
index 029654c0ed8..6b46c7f3f97 100644
Binary files a/release/datafiles/icons/brush.paint_weight.draw.dat and b/release/datafiles/icons/brush.paint_weight.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.smear.dat b/release/datafiles/icons/brush.paint_weight.smear.dat
new file mode 100644
index 00000000000..a38512ce092
Binary files /dev/null and b/release/datafiles/icons/brush.paint_weight.smear.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.simplify.dat b/release/datafiles/icons/brush.sculpt.simplify.dat
new file mode 100644
index 00000000000..b97172400d3
Binary files /dev/null and b/release/datafiles/icons/brush.sculpt.simplify.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat
index 7e981715552..97e8ef27ca1 100644
Binary files a/release/datafiles/icons/ops.paint.weight_fill.dat 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 5e9dbbcbb06..0908966f8a3 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/release/datafiles/icons/ops.paint.weight_sample.dat b/release/datafiles/icons/ops.paint.weight_sample.dat
index 45c51dcc278..e87c0415314 100644
Binary files a/release/datafiles/icons/ops.paint.weight_sample.dat and b/release/datafiles/icons/ops.paint.weight_sample.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_sample_group.dat b/release/datafiles/icons/ops.paint.weight_sample_group.dat
new file mode 100644
index 00000000000..057e85e9c33
Binary files /dev/null and b/release/datafiles/icons/ops.paint.weight_sample_group.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 950566123af..57f1079e909 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -605,14 +605,18 @@ 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.gpencil_draw.circle
brush.gpencil_draw.draw
brush.gpencil_draw.erase
brush.gpencil_draw.fill
+ brush.gpencil_draw.line
+ brush.gpencil_draw.rectangle
brush.paint_texture.airbrush
brush.paint_texture.clone
brush.paint_texture.draw
brush.paint_texture.fill
brush.paint_texture.mask
+ brush.paint_texture.masklort
brush.paint_texture.multiply
brush.paint_texture.smear
brush.paint_texture.soften
@@ -621,9 +625,11 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
brush.paint_vertex.blur
brush.paint_vertex.draw
brush.paint_vertex.smear
+ brush.paint_weight.average
brush.paint_weight.blur
brush.paint_weight.draw
brush.paint_weight.mix
+ brush.paint_weight.smear
brush.particle.add
brush.particle.comb
brush.particle.cut
@@ -646,6 +652,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
brush.sculpt.pinch
brush.sculpt.rotate
brush.sculpt.scrape
+ brush.sculpt.simplify
brush.sculpt.smooth
brush.sculpt.snake_hook
brush.sculpt.thumb
@@ -704,6 +711,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
ops.paint.weight_fill
ops.paint.weight_gradient
ops.paint.weight_sample
+ ops.paint.weight_sample_group
ops.pose.breakdowner
ops.pose.push
ops.pose.relax
More information about the Bf-blender-cvs
mailing list