diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_cursors.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 53179bab1a6..1aba6ff3fa5 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -298,7 +298,7 @@ void WM_cursor_time(wmWindow *win, int nr) {0, 56, 4, 4, 60, 68, 68, 56}, {0, 124, 64, 32, 16, 8, 8, 8}, {0, 60, 66, 66, 60, 66, 66, 60}, - {0, 56, 68, 68, 120, 64, 68, 56} + {0, 56, 68, 68, 120, 64, 68, 56}, }; unsigned char mask[16][2]; unsigned char bitmap[16][2] = {{0}}; @@ -397,7 +397,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_NW_ARROWCURSOR] = &NWArrowCursor; @@ -409,14 +409,14 @@ BEGIN_CURSOR_BLOCK 0x40, 0x01, 0x20, 0x02, 0x10, 0x04, 0x08, 0x08, 0x04, 0x10, 0x3c, 0x1e, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x3c, 0x1e, 0x04, 0x10, - 0x08, 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01 + 0x08, 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01, }; static char ns_smsk[] = { 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f, 0xfc, 0x1f, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xfc, 0x1f, 0xfc, 0x1f, - 0xf8, 0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01 + 0xf8, 0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01, }; static BCursor NSArrowCursor = { @@ -429,7 +429,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_NS_ARROWCURSOR] = &NSArrowCursor; @@ -461,7 +461,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_EW_ARROWCURSOR] = &EWArrowCursor; @@ -531,7 +531,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_WAITCURSOR] = &WaitCursor; @@ -600,7 +600,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_CROSSCURSOR] = &CrossCursor; @@ -632,7 +632,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_EDITCROSSCURSOR] = &EditCrossCursor; @@ -652,7 +652,6 @@ BEGIN_CURSOR_BLOCK 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 = { @@ -665,7 +664,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_BOXSELCURSOR] = &BoxSelCursor; @@ -677,14 +676,14 @@ BEGIN_CURSOR_BLOCK 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x2c, 0x00, 0x5a, 0x00, 0x34, 0x00, 0x2a, 0x00, 0x17, 0x80, 0x06, 0x40, 0x03, 0xa0, 0x03, 0xd0, 0x01, - 0x68, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x00, 0x00 + 0x68, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x00, 0x00, }; static char knife_smsk[] = { 0x00, 0x60, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x7e, 0x00, 0x7f, 0x80, 0x3f, 0xc0, 0x0e, 0x60, 0x07, 0xb0, 0x07, 0xd8, 0x03, - 0xec, 0x01, 0x7e, 0x00, 0x1f, 0x00, 0x07, 0x00 + 0xec, 0x01, 0x7e, 0x00, 0x1f, 0x00, 0x07, 0x00, }; static char knife_lbm[] = { @@ -704,7 +703,6 @@ BEGIN_CURSOR_BLOCK 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; static char knife_lmsk[] = { @@ -724,7 +722,6 @@ BEGIN_CURSOR_BLOCK 0xe0, 0x1b, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00, 0xb8, 0x01, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; static BCursor KnifeCursor = { @@ -737,7 +734,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 0, 31, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_KNIFECURSOR] = &KnifeCursor; @@ -813,7 +810,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 0, 0, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_VLOOPCURSOR] = &VLoopCursor; @@ -847,7 +844,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_TEXTEDITCURSOR] = &TextEditCursor; @@ -862,9 +859,6 @@ BEGIN_CURSOR_BLOCK 0x00, 0x21, 0x80, 0x20, 0x40, 0x13, 0x40, 0x17, 0xa0, 0x0b, 0x98, 0x05, 0x04, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x81, 0x00, 0x7f, 0x00, - - - }; static char paintbrush_smsk[] = { @@ -872,8 +866,6 @@ BEGIN_CURSOR_BLOCK 0x00, 0x3f, 0x80, 0x3f, 0xc0, 0x1f, 0xc0, 0x1f, 0xe0, 0x0f, 0xf8, 0x07, 0xfc, 0x03, 0xfe, 0x01, 0xfe, 0x01, 0xfe, 0x01, 0xff, 0x00, 0x7f, 0x00, - - }; static BCursor PaintBrushCursor = { @@ -886,7 +878,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_PAINTBRUSHCURSOR] = &PaintBrushCursor; @@ -921,7 +913,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_HANDCURSOR] = &HandCursor; @@ -956,7 +948,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_NSEW_SCROLLCURSOR] = &NSEWScrollCursor; @@ -992,7 +984,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_NS_SCROLLCURSOR] = &NSScrollCursor; @@ -1028,7 +1020,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_EW_SCROLLCURSOR] = &EWScrollCursor; @@ -1063,7 +1055,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_BLACK, BC_WHITE + BC_BLACK, BC_WHITE, }; BlenderCursor[BC_EYEDROPPER_CURSOR] = &EyedropperCursor; @@ -1096,7 +1088,7 @@ BEGIN_CURSOR_BLOCK 32, 32, 15, 15, /*color*/ - BC_YELLOW, BC_BLUE + BC_YELLOW, BC_BLUE, }; BlenderCursor[BC_SWAPAREA_CURSOR] = &SwapCursor; |