UI: View3D Cursor Changes

Changes the default View3D mouse cursor to the OS-supplied arrow pointer. Subsequent cursor changes will now be set per-tool instead.

Differential Revision: https://developer.blender.org/D6485

Reviewed by Campbell Barton

2 files changed, 2 insertions, 15 deletions

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 7db1a6123e8..59697c00c9c 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1027,19 +1027,9 @@ 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 *sa, ARegion *ar)
 {
-  if (WM_cursor_set_from_tool(win, sa, ar)) {
-    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 {
+  if (!WM_cursor_set_from_tool(win, sa, ar)) {
     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 504b10888e8..c8b85cd98db 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
@@ -517,10 +517,7 @@ static int gizmo_axis_test_select(bContext *UNUSED(C), wmGizmo *gz, const int mv
 
 static int gizmo_axis_cursor_get(wmGizmo *gz)
 {
-  if (gz->highlight_part > 0) {
-    return WM_CURSOR_EDIT;
-  }
-  return WM_CURSOR_NSEW_SCROLL;
+  return WM_CURSOR_DEFAULT;
 }
 
 void VIEW3D_GT_navigate_rotate(wmGizmoType *gzt)