1 files changed, 11 insertions, 1 deletions
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);
   }
 }