Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine

1 files changed, 14 insertions, 1 deletions

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index aa5be13c01b..890250d3daf 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1320,7 +1320,7 @@ class _defs_gpencil_paint:
             icon_prefix="brush.gpencil_draw.",
             type=bpy.types.Brush,
             attr="gpencil_tool",
-            cursor='PAINT_CROSS',
+            cursor='DOT',
             tooldef_keywords=dict(
                 operator="gpencil.draw",
             ),
@@ -1392,6 +1392,17 @@ class _defs_gpencil_paint:
             keymap=(),
         )
 
+    @ToolDef.from_fn
+    def eyedropper():
+        return dict(
+            idname="builtin.eyedropper",
+            label="Eyedropper",
+            icon="ops.paint.weight_sample",
+            cursor='EYEDROPPER',
+            widget=None,
+            keymap=(),
+        )
+
 
 class _defs_gpencil_edit:
     @ToolDef.from_fn
@@ -2044,6 +2055,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             _defs_gpencil_paint.generate_from_brushes,
             _defs_gpencil_paint.cutter,
             None,
+            _defs_gpencil_paint.eyedropper,
+            None,
             _defs_gpencil_paint.line,
             _defs_gpencil_paint.arc,
             _defs_gpencil_paint.curve,