[Bf-blender-cvs] [f267921774c] blender2.8: UI: remove grease pencil icons

Campbell Barton noreply at git.blender.org
Sat Nov 3 10:36:25 CET 2018 

Commit: f267921774ca0755040f73ea53319002a987c166
Author: Campbell Barton
Date:   Sat Nov 3 20:33:59 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf267921774ca0755040f73ea53319002a987c166

UI: remove grease pencil icons

Grease pencil tool now uses an icon for each tool,
previously it mapped icons to tool icons which is now not needed
because for each tool a different brush can be selected which has it's
own icon.

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

D	release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat
D	release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat
D	release/datafiles/icons/brush.gpencil.draw_block.dat
D	release/datafiles/icons/brush.gpencil.draw_ink.dat
D	release/datafiles/icons/brush.gpencil.draw_marker.dat
D	release/datafiles/icons/brush.gpencil.draw_noise.dat
D	release/datafiles/icons/brush.gpencil.draw_pen.dat
R100	release/datafiles/icons/brush.gpencil.draw_pencil.dat	release/datafiles/icons/brush.gpencil_draw.draw.dat
R100	release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat	release/datafiles/icons/brush.gpencil_draw.erase.dat
R100	release/datafiles/icons/brush.gpencil.draw_fill.dat	release/datafiles/icons/brush.gpencil_draw.fill.dat
M	release/datafiles/icons/brush.particle.weight.dat
M	release/datafiles/icons/ops.curve.draw.dat
M	release/datafiles/icons/ops.curve.extrude_cursor.dat
M	release/datafiles/icons/ops.curve.extrude_move.dat
M	release/datafiles/icons/ops.pose.breakdowner.dat
M	release/datafiles/icons/ops.pose.push.dat
M	release/datafiles/icons/ops.pose.relax.dat
M	release/datafiles/icons/ops.transform.bone_envelope.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.gpencil.draw.eraser_soft.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat
deleted file mode 100644
index 777e3aabe40..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat
deleted file mode 100644
index ad9216a2247..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_block.dat b/release/datafiles/icons/brush.gpencil.draw_block.dat
deleted file mode 100644
index fe4175c6d09..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw_block.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_ink.dat b/release/datafiles/icons/brush.gpencil.draw_ink.dat
deleted file mode 100644
index 3137a3f431a..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw_ink.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_marker.dat b/release/datafiles/icons/brush.gpencil.draw_marker.dat
deleted file mode 100644
index b0b821109a3..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw_marker.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_noise.dat b/release/datafiles/icons/brush.gpencil.draw_noise.dat
deleted file mode 100644
index d29c0624704..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw_noise.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_pen.dat b/release/datafiles/icons/brush.gpencil.draw_pen.dat
deleted file mode 100644
index d31e2055687..00000000000
Binary files a/release/datafiles/icons/brush.gpencil.draw_pen.dat and /dev/null differ
diff --git a/release/datafiles/icons/brush.gpencil.draw_pencil.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat
similarity index 100%
rename from release/datafiles/icons/brush.gpencil.draw_pencil.dat
rename to release/datafiles/icons/brush.gpencil_draw.draw.dat
diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat
similarity index 100%
rename from release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat
rename to release/datafiles/icons/brush.gpencil_draw.erase.dat
diff --git a/release/datafiles/icons/brush.gpencil.draw_fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat
similarity index 100%
rename from release/datafiles/icons/brush.gpencil.draw_fill.dat
rename to release/datafiles/icons/brush.gpencil_draw.fill.dat
diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat
index ee14fa4eda5..833bbca506b 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/ops.curve.draw.dat b/release/datafiles/icons/ops.curve.draw.dat
index 5622b99a1f3..5228833daa3 100644
Binary files a/release/datafiles/icons/ops.curve.draw.dat and b/release/datafiles/icons/ops.curve.draw.dat differ
diff --git a/release/datafiles/icons/ops.curve.extrude_cursor.dat b/release/datafiles/icons/ops.curve.extrude_cursor.dat
index f2fd1f44cab..5ab67727f72 100644
Binary files a/release/datafiles/icons/ops.curve.extrude_cursor.dat and b/release/datafiles/icons/ops.curve.extrude_cursor.dat differ
diff --git a/release/datafiles/icons/ops.curve.extrude_move.dat b/release/datafiles/icons/ops.curve.extrude_move.dat
index a63fa1fa525..cbd0eb5e620 100644
Binary files a/release/datafiles/icons/ops.curve.extrude_move.dat and b/release/datafiles/icons/ops.curve.extrude_move.dat differ
diff --git a/release/datafiles/icons/ops.pose.breakdowner.dat b/release/datafiles/icons/ops.pose.breakdowner.dat
index 0ccbad1f04d..25ba7bde2d9 100644
Binary files a/release/datafiles/icons/ops.pose.breakdowner.dat and b/release/datafiles/icons/ops.pose.breakdowner.dat differ
diff --git a/release/datafiles/icons/ops.pose.push.dat b/release/datafiles/icons/ops.pose.push.dat
index e11f1d54254..2ab36223c96 100644
Binary files a/release/datafiles/icons/ops.pose.push.dat and b/release/datafiles/icons/ops.pose.push.dat differ
diff --git a/release/datafiles/icons/ops.pose.relax.dat b/release/datafiles/icons/ops.pose.relax.dat
index 63158340e15..c3c8983eaa5 100644
Binary files a/release/datafiles/icons/ops.pose.relax.dat and b/release/datafiles/icons/ops.pose.relax.dat differ
diff --git a/release/datafiles/icons/ops.transform.bone_envelope.dat b/release/datafiles/icons/ops.transform.bone_envelope.dat
index b1735aa6c09..75084eb9fe1 100644
Binary files a/release/datafiles/icons/ops.transform.bone_envelope.dat and b/release/datafiles/icons/ops.transform.bone_envelope.dat differ
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 6d44ca95f03..d5019d1b5d8 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -45,7 +45,6 @@ def generate_from_brushes_tool_slots_ex(
         brush_category_attr,
         brush_category_layout,
         # Optional
-        icon_fn=None,
         tooldef_keywords={},
 ):
     # Categories
@@ -55,18 +54,12 @@ def generate_from_brushes_tool_slots_ex(
         if brush is None:
             continue
         category = getattr(brush, brush_category_attr)
-
-        if icon_fn is not None:
-            icon_id = icon_fn(brush)
-        else:
-            icon_id = category.lower()
-
         name = brush.name
         brush_categories.setdefault(category, []).append(
             ToolDef.from_dict(
                 dict(
                     text=name,
-                    icon=icon_prefix + icon_id,
+                    icon=icon_prefix + category.lower(),
                     data_block=name,
                     **tooldef_keywords,
                 )
@@ -1385,23 +1378,9 @@ class _defs_gpencil_paint:
         def draw_settings(context, layout, tool):
             _defs_gpencil_paint.draw_settings_common(context, layout, tool)
 
-        def icon_fn(brush):
-            return {
-                'PENCIL': 'draw_pencil',
-                'PEN': 'draw_pen',
-                'INK': 'draw_ink',
-                'INKNOISE': 'draw_noise',
-                'BLOCK': 'draw_block',
-                'MARKER': 'draw_marker',
-                'FILL': 'draw_fill',
-                'SOFT': 'draw.eraser_soft',
-                'HARD': 'draw.eraser_hard',
-                'STROKE': 'draw.eraser_stroke',
-            }[brush.gpencil_settings.gp_icon]
-
         return generate_from_brushes_tool_slots_ex(
             context, context.tool_settings.gpencil_paint,
-            icon_prefix="brush.gpencil.",
+            icon_prefix="brush.gpencil_draw.",
             brush_category_attr="gpencil_tool",
             brush_category_layout=(
                 ('DRAW',),
@@ -1412,11 +1391,9 @@ class _defs_gpencil_paint:
                 operator="gpencil.draw",
                 draw_settings=draw_settings,
             ),
-            icon_fn=icon_fn,
         )
 
 
-
 class _defs_gpencil_edit:
     @ToolDef.from_fn
     def bend():
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index d4974b24034..16c01b54497 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -605,16 +605,9 @@ 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.eraser_hard
-	brush.gpencil.draw.eraser_soft
-	brush.gpencil.draw.eraser_stroke
-	brush.gpencil.draw_block
-	brush.gpencil.draw_fill
-	brush.gpencil.draw_ink
-	brush.gpencil.draw_marker
-	brush.gpencil.draw_noise
-	brush.gpencil.draw_pen
-	brush.gpencil.draw_pencil
+	brush.gpencil_draw.draw
+	brush.gpencil_draw.erase
+	brush.gpencil_draw.fill
 	brush.paint_texture.airbrush
 	brush.paint_texture.clone
 	brush.paint_texture.draw

More information about the Bf-blender-cvs mailing list