[Bf-blender-cvs] [0f20696846b] master: Icons: Add Links Cut icon to Node Editor, plus other tweaks

William Reynish noreply at git.blender.org
Mon Mar 11 23:22:44 CET 2019


Commit: 0f20696846b0b84abaf7cc8e024c67674f453cd8
Author: William Reynish
Date:   Mon Mar 11 23:22:41 2019 +0100
Branches: master
https://developer.blender.org/rB0f20696846b0b84abaf7cc8e024c67674f453cd8

Icons: Add Links Cut icon to Node Editor, plus other tweaks

- Tweaks to Paint Mode Fill and Sample tool icons
- Tweaks to GP Add Primitive icons

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

M	release/datafiles/icons/brush.gpencil_draw.erase.dat
M	release/datafiles/icons/brush.gpencil_draw.fill.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
M	release/datafiles/icons/brush.paint_texture.smear.dat
M	release/datafiles/icons/ops.gpencil.extrude_move.dat
M	release/datafiles/icons/ops.gpencil.primitive_arc.dat
M	release/datafiles/icons/ops.gpencil.primitive_box.dat
M	release/datafiles/icons/ops.gpencil.primitive_circle.dat
M	release/datafiles/icons/ops.gpencil.primitive_curve.dat
M	release/datafiles/icons/ops.gpencil.primitive_line.dat
M	release/datafiles/icons/ops.gpencil.stroke_cutter.dat
A	release/datafiles/icons/ops.node.links_cut.dat
M	release/datafiles/icons/ops.paint.weight_fill.dat
M	release/datafiles/icons/ops.paint.weight_sample.dat
M	release/datafiles/icons/ops.paint.weight_sample_group.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.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat
index 7a6b69d78dc..5b96035c9b8 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 1a7b71eb975..869e65b2fbf 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.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat
index 4ea56d1450a..5d94ab45ada 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 cdb4ccf5efb..cfa5f1a6042 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 1a7b71eb975..869e65b2fbf 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 29feb1dccb9..cea902261fa 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.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat
index 36958641266..694655477db 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/ops.gpencil.extrude_move.dat b/release/datafiles/icons/ops.gpencil.extrude_move.dat
index 755e0abd4d4..92e50c9e77e 100644
Binary files a/release/datafiles/icons/ops.gpencil.extrude_move.dat and b/release/datafiles/icons/ops.gpencil.extrude_move.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_arc.dat b/release/datafiles/icons/ops.gpencil.primitive_arc.dat
index 8527639fcb9..cabdaeedea1 100644
Binary files a/release/datafiles/icons/ops.gpencil.primitive_arc.dat and b/release/datafiles/icons/ops.gpencil.primitive_arc.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_box.dat b/release/datafiles/icons/ops.gpencil.primitive_box.dat
index 80525d8d929..b2f6d468e04 100644
Binary files a/release/datafiles/icons/ops.gpencil.primitive_box.dat and b/release/datafiles/icons/ops.gpencil.primitive_box.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_circle.dat b/release/datafiles/icons/ops.gpencil.primitive_circle.dat
index 3bf346eaada..f9a60f1507e 100644
Binary files a/release/datafiles/icons/ops.gpencil.primitive_circle.dat and b/release/datafiles/icons/ops.gpencil.primitive_circle.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_curve.dat b/release/datafiles/icons/ops.gpencil.primitive_curve.dat
index 45a72c145ab..6bc585a94fb 100644
Binary files a/release/datafiles/icons/ops.gpencil.primitive_curve.dat and b/release/datafiles/icons/ops.gpencil.primitive_curve.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_line.dat b/release/datafiles/icons/ops.gpencil.primitive_line.dat
index 8c64bb59804..67bce8b16e8 100644
Binary files a/release/datafiles/icons/ops.gpencil.primitive_line.dat and b/release/datafiles/icons/ops.gpencil.primitive_line.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat
index e0cd9aeff6c..31a130a23f5 100644
Binary files a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat and b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat differ
diff --git a/release/datafiles/icons/ops.node.links_cut.dat b/release/datafiles/icons/ops.node.links_cut.dat
new file mode 100644
index 00000000000..dbe79cb9661
Binary files /dev/null and b/release/datafiles/icons/ops.node.links_cut.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat
index 1a7b71eb975..869e65b2fbf 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_sample.dat b/release/datafiles/icons/ops.paint.weight_sample.dat
index 01d4194a747..423365f5a55 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
index 78600946d67..b37eb59ad23 100644
Binary files a/release/datafiles/icons/ops.paint.weight_sample_group.dat and b/release/datafiles/icons/ops.paint.weight_sample_group.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 5940a3f70d7..a7f555288ad 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1387,7 +1387,7 @@ class _defs_node_edit:
     def links_cut():
         return dict(
             text="Links Cut",
-            icon="ops.mesh.knife_tool",
+            icon="ops.node.links_cut",
             widget=None,
             keymap="Node Tool: Links Cut",
         )
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 325a369ef7e..876af10f884 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -723,6 +723,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
 	ops.mesh.spin
 	ops.mesh.spin.duplicate
 	ops.mesh.vertices_smooth
+	ops.node.links_cut
 	ops.paint.vertex_color_fill
 	ops.paint.weight_fill
 	ops.paint.weight_gradient



More information about the Bf-blender-cvs mailing list