[Bf-blender-cvs] [2dafc39d566] blender2.8: Icons: new icons for sculpt border hide/mask
William Reynish
noreply at git.blender.org
Thu Aug 23 15:00:34 CEST 2018
Commit: 2dafc39d566aa5c65b148cadf1129305ac1ceabc
Author: William Reynish
Date: Thu Aug 23 22:46:04 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB2dafc39d566aa5c65b148cadf1129305ac1ceabc
Icons: new icons for sculpt border hide/mask
===================================================================
M release/datafiles/icons/brush.particle.add.dat
M release/datafiles/icons/brush.particle.comb.dat
M release/datafiles/icons/brush.particle.cut.dat
M release/datafiles/icons/brush.particle.length.dat
M release/datafiles/icons/brush.particle.puff.dat
M release/datafiles/icons/brush.particle.smooth.dat
M release/datafiles/icons/brush.particle.weight.dat
M release/datafiles/icons/brush.sculpt.mask.dat
A release/datafiles/icons/ops.sculpt.border_hide.dat
A release/datafiles/icons/ops.sculpt.border_mask.dat
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/datafiles/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/icons/brush.particle.add.dat b/release/datafiles/icons/brush.particle.add.dat
index e78bf251371..ee785ef7dc6 100644
Binary files a/release/datafiles/icons/brush.particle.add.dat and b/release/datafiles/icons/brush.particle.add.dat differ
diff --git a/release/datafiles/icons/brush.particle.comb.dat b/release/datafiles/icons/brush.particle.comb.dat
index 5ece6bf754d..39fd44debdc 100644
Binary files a/release/datafiles/icons/brush.particle.comb.dat and b/release/datafiles/icons/brush.particle.comb.dat differ
diff --git a/release/datafiles/icons/brush.particle.cut.dat b/release/datafiles/icons/brush.particle.cut.dat
index 79306d5d7e9..3a62a9c1900 100644
Binary files a/release/datafiles/icons/brush.particle.cut.dat and b/release/datafiles/icons/brush.particle.cut.dat differ
diff --git a/release/datafiles/icons/brush.particle.length.dat b/release/datafiles/icons/brush.particle.length.dat
index 4c9da271316..169b8ba6239 100644
Binary files a/release/datafiles/icons/brush.particle.length.dat and b/release/datafiles/icons/brush.particle.length.dat differ
diff --git a/release/datafiles/icons/brush.particle.puff.dat b/release/datafiles/icons/brush.particle.puff.dat
index 9e6523558ae..e9d626123b1 100644
Binary files a/release/datafiles/icons/brush.particle.puff.dat and b/release/datafiles/icons/brush.particle.puff.dat differ
diff --git a/release/datafiles/icons/brush.particle.smooth.dat b/release/datafiles/icons/brush.particle.smooth.dat
index a3cbe3cf657..5424bd53ac9 100644
Binary files a/release/datafiles/icons/brush.particle.smooth.dat and b/release/datafiles/icons/brush.particle.smooth.dat differ
diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat
index 309ee157a19..75d78e63625 100644
Binary files a/release/datafiles/icons/brush.particle.weight.dat and b/release/datafiles/icons/brush.particle.weight.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/brush.sculpt.mask.dat
index 3a2819168d3..7a14f45e468 100644
Binary files a/release/datafiles/icons/brush.sculpt.mask.dat and b/release/datafiles/icons/brush.sculpt.mask.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/ops.sculpt.border_hide.dat
similarity index 76%
copy from release/datafiles/icons/brush.sculpt.mask.dat
copy to release/datafiles/icons/ops.sculpt.border_hide.dat
index 3a2819168d3..ca2f5b8405a 100644
Binary files a/release/datafiles/icons/brush.sculpt.mask.dat and b/release/datafiles/icons/ops.sculpt.border_hide.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/ops.sculpt.border_mask.dat
similarity index 100%
copy from release/datafiles/icons/brush.sculpt.mask.dat
copy to release/datafiles/icons/ops.sculpt.border_mask.dat
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
More information about the Bf-blender-cvs
mailing list