[Bf-blender-cvs] [f6048156ec0] soc-2021-curves: Add new curve pen icon

Dilith Jayakody noreply at git.blender.org
Sun Apr 3 17:34:16 CEST 2022


Commit: f6048156ec08c76e9a85cd1b5bcccc0d7372c031
Author: Dilith Jayakody
Date:   Wed Mar 16 09:07:36 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBf6048156ec08c76e9a85cd1b5bcccc0d7372c031

Add new curve pen icon

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

M	release/datafiles/icons/ops.curve.draw.dat
A	release/datafiles/icons/ops.curve.pen.dat
M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	source/blender/editors/datafiles/CMakeLists.txt

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

diff --git a/release/datafiles/icons/ops.curve.draw.dat b/release/datafiles/icons/ops.curve.draw.dat
index cf2c8e31bcb..da4c7424756 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.pen.dat b/release/datafiles/icons/ops.curve.pen.dat
new file mode 100644
index 00000000000..1007f7ea604
Binary files /dev/null and b/release/datafiles/icons/ops.curve.pen.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 441e4e300bd..fc621c5b51e 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1211,7 +1211,7 @@ class _defs_edit_curve:
             idname="builtin.pen",
             label="Curve Pen",
             cursor='CROSSHAIR',
-            icon="ops.curve.draw",
+            icon="ops.curve.pen",
             widget=None,
             keymap=(),
             draw_settings=draw_settings,
@@ -2897,6 +2897,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             *_tools_default,
             None,
             _defs_edit_curve.draw,
+            _defs_edit_curve.pen,
             (
                 _defs_edit_curve.extrude,
                 _defs_edit_curve.extrude_cursor,
@@ -2907,8 +2908,6 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             None,
             _defs_transform.shear,
             _defs_edit_curve.curve_vertex_randomize,
-            None,
-            _defs_edit_curve.pen,
         ],
         'EDIT_SURFACE': [
             *_tools_default,
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index edbdc1ee96f..7b3c71f56e9 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -766,6 +766,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.armature.extrude_cursor
   ops.armature.extrude_move
   ops.curve.draw
+  ops.curve.pen
   ops.curve.extrude_cursor
   ops.curve.extrude_move
   ops.curve.radius



More information about the Bf-blender-cvs mailing list