Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Reynish <billreynish>2018-08-23 15:46:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-23 16:06:24 +0300
commit2dafc39d566aa5c65b148cadf1129305ac1ceabc (patch)
treefea367f98a6084127e896b77774070c7545ec110
parent09895cae4846181783793953bc300013dd59817b (diff)
Icons: new icons for sculpt border hide/mask
-rw-r--r--release/datafiles/icons/brush.particle.add.datbin2060 -> 1376 bytes
-rw-r--r--release/datafiles/icons/brush.particle.comb.datbin3590 -> 2564 bytes
-rw-r--r--release/datafiles/icons/brush.particle.cut.datbin6578 -> 2600 bytes
-rw-r--r--release/datafiles/icons/brush.particle.length.datbin3824 -> 2654 bytes
-rw-r--r--release/datafiles/icons/brush.particle.puff.datbin3572 -> 2618 bytes
-rw-r--r--release/datafiles/icons/brush.particle.smooth.datbin2870 -> 1844 bytes
-rw-r--r--release/datafiles/icons/brush.particle.weight.datbin3878 -> 2852 bytes
-rw-r--r--release/datafiles/icons/brush.sculpt.mask.datbin1592 -> 2816 bytes
-rw-r--r--release/datafiles/icons/ops.sculpt.border_hide.datbin0 -> 1376 bytes
-rw-r--r--release/datafiles/icons/ops.sculpt.border_mask.datbin0 -> 1592 bytes
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py4
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt2
12 files changed, 4 insertions, 2 deletions
diff --git a/release/datafiles/icons/brush.particle.add.dat b/release/datafiles/icons/brush.particle.add.dat
index e78bf251371..ee785ef7dc6 100644
--- a/release/datafiles/icons/brush.particle.add.dat
+++ b/release/datafiles/icons/brush.particle.add.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.comb.dat b/release/datafiles/icons/brush.particle.comb.dat
index 5ece6bf754d..39fd44debdc 100644
--- a/release/datafiles/icons/brush.particle.comb.dat
+++ b/release/datafiles/icons/brush.particle.comb.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.cut.dat b/release/datafiles/icons/brush.particle.cut.dat
index 79306d5d7e9..3a62a9c1900 100644
--- a/release/datafiles/icons/brush.particle.cut.dat
+++ b/release/datafiles/icons/brush.particle.cut.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.length.dat b/release/datafiles/icons/brush.particle.length.dat
index 4c9da271316..169b8ba6239 100644
--- a/release/datafiles/icons/brush.particle.length.dat
+++ b/release/datafiles/icons/brush.particle.length.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.puff.dat b/release/datafiles/icons/brush.particle.puff.dat
index 9e6523558ae..e9d626123b1 100644
--- a/release/datafiles/icons/brush.particle.puff.dat
+++ b/release/datafiles/icons/brush.particle.puff.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.smooth.dat b/release/datafiles/icons/brush.particle.smooth.dat
index a3cbe3cf657..5424bd53ac9 100644
--- a/release/datafiles/icons/brush.particle.smooth.dat
+++ b/release/datafiles/icons/brush.particle.smooth.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat
index 309ee157a19..75d78e63625 100644
--- a/release/datafiles/icons/brush.particle.weight.dat
+++ b/release/datafiles/icons/brush.particle.weight.dat
Binary files differ
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/brush.sculpt.mask.dat
index 3a2819168d3..7a14f45e468 100644
--- a/release/datafiles/icons/brush.sculpt.mask.dat
+++ b/release/datafiles/icons/brush.sculpt.mask.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.sculpt.border_hide.dat b/release/datafiles/icons/ops.sculpt.border_hide.dat
new file mode 100644
index 00000000000..ca2f5b8405a
--- /dev/null
+++ b/release/datafiles/icons/ops.sculpt.border_hide.dat
Binary files differ
diff --git a/release/datafiles/icons/ops.sculpt.border_mask.dat b/release/datafiles/icons/ops.sculpt.border_mask.dat
new file mode 100644
index 00000000000..3a2819168d3
--- /dev/null
+++ b/release/datafiles/icons/ops.sculpt.border_mask.dat
Binary files differ
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 8f7fec387ff..af65ca35c52 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -939,7 +939,7 @@ class _defs_sculpt:
def hide_border():
return dict(
text="Border Hide",
- icon="none",
+ icon="ops.sculpt.border_hide",
widget=None,
keymap=(
("paint.hide_show", dict(action='HIDE'), dict(type='EVT_TWEAK_A', value='ANY')),
@@ -952,7 +952,7 @@ class _defs_sculpt:
def mask_border():
return dict(
text="Border Mask",
- icon="none",
+ icon="ops.sculpt.border_mask",
widget=None,
keymap=(
("view3d.select_border", dict(mode='ADD'), dict(type='EVT_TWEAK_A', value='ANY')),
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 910b61cbdd8..52823fe731e 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -642,6 +642,8 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
ops.paint.vertex_color_fill
ops.paint.weight_fill
ops.paint.weight_gradient
+ ops.sculpt.border_hide
+ ops.sculpt.border_mask
ops.transform.edge_slide
ops.transform.push_pull
ops.transform.resize.cage