[Bf-blender-cvs] [da63ac55763] master: Cleanup: remove unused cursors without high resolution image

Brecht Van Lommel noreply at git.blender.org
Thu Sep 26 16:26:21 CEST 2019


Commit: da63ac5576334d2654856f45b627e1d04f31c134
Author: Brecht Van Lommel
Date:   Thu Sep 26 16:15:19 2019 +0200
Branches: master
https://developer.blender.org/rBda63ac5576334d2654856f45b627e1d04f31c134

Cleanup: remove unused cursors without high resolution image

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

M	source/blender/windowmanager/intern/wm_cursors.c
M	source/blender/windowmanager/wm_cursors.h

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

diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index 333f8f39970..38297dbd8ba 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -909,78 +909,6 @@ void wm_init_cursor_data(void)
   BlenderCursor[WM_CURSOR_CROSSC] = &CrossCursorC;
   END_CURSOR_BLOCK;
 
-  /********************** EditCross Cursor ***********************/
-  BEGIN_CURSOR_BLOCK;
-  static char editcross_sbm[] = {
-      0x0e, 0x00, 0x11, 0x00, 0x1d, 0x00, 0x19, 0x03, 0x1d, 0x03, 0x11,
-      0x03, 0x0e, 0x03, 0x00, 0x03, 0xf8, 0x7c, 0xf8, 0x7c, 0x00, 0x03,
-      0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
-  };
-
-  static char editcross_smsk[] = {
-      0x0e, 0x00, 0x1f, 0x00, 0x1f, 0x03, 0x1f, 0x03, 0x1f, 0x03, 0x1f,
-      0x03, 0x0e, 0x03, 0x80, 0x07, 0xfc, 0xfc, 0xfc, 0xfc, 0x80, 0x07,
-      0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
-  };
-
-  static BCursor EditCrossCursor = {
-      /* small */
-      editcross_sbm,
-      editcross_smsk,
-      16,
-      16,
-      9,
-      8,
-      /* big */
-      NULL,
-      NULL,
-      32,
-      32,
-      15,
-      15,
-      /* don't invert color */
-      false,
-  };
-
-  BlenderCursor[WM_CURSOR_EDITCROSS] = &EditCrossCursor;
-  END_CURSOR_BLOCK;
-
-  /********************** Box Select *************************/
-  BEGIN_CURSOR_BLOCK;
-  static char box_sbm[32] = {
-      0x7f, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x06, 0x41, 0x06, 0x41,
-      0x06, 0x7f, 0x06, 0x00, 0x06, 0xe0, 0x79, 0xe0, 0x79, 0x00, 0x06,
-      0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x00,
-  };
-
-  static char box_smsk[32] = {
-      0x7f, 0x00, 0x7f, 0x00, 0x63, 0x06, 0x63, 0x06, 0x63, 0x06, 0x7f,
-      0x06, 0x7f, 0x06, 0x00, 0x0f, 0xf0, 0xf9, 0xf0, 0xf9, 0x00, 0x0f,
-      0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06,
-  };
-
-  static BCursor BoxSelCursor = {
-      /* small */
-      box_sbm,
-      box_smsk,
-      16,
-      16,
-      9,
-      8,
-      /* big */
-      NULL,
-      NULL,
-      32,
-      32,
-      15,
-      15,
-      /* don't invert color */
-      false,
-  };
-
-  BlenderCursor[WM_CURSOR_BOXSEL] = &BoxSelCursor;
-
-  END_CURSOR_BLOCK;
   /********************** Knife Cursor ***********************/
   BEGIN_CURSOR_BLOCK;
   static char knife_sbm[] = {
diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h
index de646882fcc..d13f455c6a8 100644
--- a/source/blender/windowmanager/wm_cursors.h
+++ b/source/blender/windowmanager/wm_cursors.h
@@ -56,13 +56,10 @@ typedef enum WMCursorType {
   WM_CURSOR_X_MOVE,
   WM_CURSOR_Y_MOVE,
   WM_CURSOR_COPY,
-
   WM_CURSOR_NW_ARROW,
   WM_CURSOR_NS_ARROW,
   WM_CURSOR_EW_ARROW,
   WM_CURSOR_CROSS,
-  WM_CURSOR_EDITCROSS,
-  WM_CURSOR_BOXSEL,
   WM_CURSOR_KNIFE,
   WM_CURSOR_VERTEX_LOOP,
   WM_CURSOR_TEXT_EDIT,



More information about the Bf-blender-cvs mailing list