diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-16 21:16:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-16 21:29:22 +0300 |
| commit | 40a8c4908818bdf1c4628a389803a9a26e2d68f1 (patch) | |
| tree | bf1eed08131bad513b737e4016b5557c8d86768d /release | |
| parent | 087a4898676d744d4aaa46a59b47186825495820 (diff) | |
Revert new grease pencil cursor for paint modes
This reverts commit a412f49e7580a and 873c756e5dd73. The change was only
supposed to affect grease pencil, but also changed the cursor for sculpt mode,
where it's not clearly visible. Since this has not been quickly resolved I'm
reverting the commit.
Ref D5036.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 59d38cc8ae4..5fcf117ecf1 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -60,7 +60,6 @@ def generate_from_enum_ex( idname=idname_prefix + name, label=name, icon=icon_prefix + idname.lower(), - cursor='PAINT_CROSSHAIR', data_block=idname, **tooldef_keywords, ) @@ -200,7 +199,7 @@ class _defs_annotate: idname="builtin.annotate_line", label="Annotate Line", icon="ops.gpencil.draw.line", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', keymap="Generic Tool: Annotate Line", draw_settings=draw_settings, ) @@ -211,7 +210,7 @@ class _defs_annotate: idname="builtin.annotate_polygon", label="Annotate Polygon", icon="ops.gpencil.draw.poly", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', keymap="Generic Tool: Annotate Polygon", draw_settings=draw_settings, ) @@ -226,7 +225,7 @@ class _defs_annotate: idname="builtin.annotate_eraser", label="Annotate Eraser", icon="ops.gpencil.draw.eraser", - cursor='PAINT_CROSSHAIR', # XXX: Always show brush circle when enabled + cursor='CROSSHAIR', # XXX: Always show brush circle when enabled keymap="Generic Tool: Annotate Eraser", draw_settings=draw_settings, ) @@ -1287,7 +1286,7 @@ class _defs_gpencil_paint: idname="builtin.line", label="Line", icon="ops.gpencil.primitive_line", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', widget=None, keymap=(), ) @@ -1298,7 +1297,7 @@ class _defs_gpencil_paint: idname="builtin.box", label="Box", icon="ops.gpencil.primitive_box", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', widget=None, keymap=(), ) @@ -1309,7 +1308,7 @@ class _defs_gpencil_paint: idname="builtin.circle", label="Circle", icon="ops.gpencil.primitive_circle", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', widget=None, keymap=(), ) @@ -1320,7 +1319,7 @@ class _defs_gpencil_paint: idname="builtin.arc", label="Arc", icon="ops.gpencil.primitive_arc", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', widget=None, keymap=(), ) @@ -1331,7 +1330,7 @@ class _defs_gpencil_paint: idname="builtin.curve", label="Curve", icon="ops.gpencil.primitive_curve", - cursor='PAINT_CROSSHAIR', + cursor='CROSSHAIR', widget=None, keymap=(), ) |