[Bf-blender-cvs] [219ce574b56] blender-v2.83-release: Revert "UI: View3D Cursor Changes"

[Dalai Felinto]

Commit: 219ce574b56585eb5db056983a8acf08f7ff9991
Author: Dalai Felinto
Date:   Mon May 25 11:53:02 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB219ce574b56585eb5db056983a8acf08f7ff9991

Revert "UI: View3D Cursor Changes"

This change is yet to be followed by a more comprehensive design
proposal including:

* How to differentiate the modes apart.
* More clear definition of tools and the rules for their components (gizmo, cursor).
* Selection as a non-tool vs drag option.

This can be revisited for 2.90 with more time. For now the UI team
agrees to revert this.

--
This reverts commit 4aa703aa1430bc53f19e2cc7182e70db1a916f13.

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 3c9355d0017..8d1f23e5df0 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -137,7 +137,6 @@ class _defs_view3d_generic:
             idname="builtin.measure",
             label="Measure",
             description=description,
-            cursor='CROSSHAIR',
             icon="ops.view3d.ruler",
             widget="VIEW3D_GGT_ruler",
             keymap="3D View Tool: Measure",
@@ -375,7 +374,6 @@ class _defs_view3d_select:
             label="Select Lasso",
             icon="ops.generic.select_lasso",
             widget=None,
-            cursor='DEFAULT',
             keymap="3D View Tool: Select Lasso",
             draw_settings=draw_settings,
         )
@@ -400,7 +398,6 @@ class _defs_view3d_select:
             label="Select Circle",
             icon="ops.generic.select_circle",
             widget=None,
-            cursor='DEFAULT',
             keymap="3D View Tool: Select Circle",
             draw_settings=draw_settings,
             draw_cursor=draw_cursor,
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index a5c99016434..51607c5daa3 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1082,9 +1082,19 @@ static void view3d_main_region_message_subscribe(const struct bContext *C,
   }
 }
 
+/* concept is to retrieve cursor type context-less */
 static void view3d_main_region_cursor(wmWindow *win, ScrArea *area, ARegion *region)
 {
-  if (!WM_cursor_set_from_tool(win, area, region)) {
+  if (WM_cursor_set_from_tool(win, area, region)) {
+    return;
+  }
+
+  ViewLayer *view_layer = WM_window_get_active_view_layer(win);
+  Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
+  if (obedit) {
+    WM_cursor_set(win, WM_CURSOR_EDIT);
+  }
+  else {
     WM_cursor_set(win, WM_CURSOR_DEFAULT);
   }
 }
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
index 3301e28c90c..3ce4c8dc9a8 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
@@ -536,9 +536,12 @@ static int gizmo_axis_test_select(bContext *UNUSED(C), wmGizmo *gz, const int mv
   return -1;
 }
 
-static int gizmo_axis_cursor_get(wmGizmo *UNUSED(gz))
+static int gizmo_axis_cursor_get(wmGizmo *gz)
 {
-  return WM_CURSOR_DEFAULT;
+  if (gz->highlight_part > 0) {
+    return WM_CURSOR_EDIT;
+  }
+  return WM_CURSOR_NSEW_SCROLL;
 }
 
 void VIEW3D_GT_navigate_rotate(wmGizmoType *gzt)