[Bf-blender-cvs] [60a827a2a99] master: UI: Update paint crosshair for Mac
William Reynish
noreply at git.blender.org
Tue Oct 1 00:00:08 CEST 2019
Commit: 60a827a2a9917c142a66e932e9009948ea6b7b78
Author: William Reynish
Date: Tue Oct 1 00:00:06 2019 +0200
Branches: master
https://developer.blender.org/rB60a827a2a9917c142a66e932e9009948ea6b7b78
UI: Update paint crosshair for Mac
This is based on feedback from users.
Only affects Mac for now, Windows will be committed separately.
===================================================================
M intern/ghost/intern/GHOST_WindowCocoa.mm
R080 release/darwin/Blender.app/Contents/Resources/crossb.pdf release/darwin/Blender.app/Contents/Resources/paint_cursor_cross.pdf
R083 release/darwin/Blender.app/Contents/Resources/crossa.pdf release/darwin/Blender.app/Contents/Resources/paint_cursor_dot.pdf
===================================================================
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 1e0952c3bd6..e46e589fea4 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1013,9 +1013,9 @@ NSCursor *GHOST_WindowCocoa::getStandardCursor(GHOST_TStandardCursor shape) cons
case GHOST_kStandardCursorHorizontalSplit:
return getImageCursor(shape, @"splith.pdf", NSMakePoint(16, 16));
case GHOST_kStandardCursorCrosshairA:
- return getImageCursor(shape, @"crossa.pdf", NSMakePoint(16, 16));
+ return getImageCursor(shape, @"paint_cursor_cross.pdf", NSMakePoint(16, 15));
case GHOST_kStandardCursorCrosshairB:
- return getImageCursor(shape, @"crossb.pdf", NSMakePoint(16, 16));
+ return getImageCursor(shape, @"paint_cursor_dot.pdf", NSMakePoint(16, 15));
case GHOST_kStandardCursorCrosshairC:
return getImageCursor(shape, @"crossc.pdf", NSMakePoint(16, 16));
default:
diff --git a/release/darwin/Blender.app/Contents/Resources/crossb.pdf b/release/darwin/Blender.app/Contents/Resources/paint_cursor_cross.pdf
similarity index 80%
rename from release/darwin/Blender.app/Contents/Resources/crossb.pdf
rename to release/darwin/Blender.app/Contents/Resources/paint_cursor_cross.pdf
index 7cbc0a8bdc0..4f658f3b722 100644
Binary files a/release/darwin/Blender.app/Contents/Resources/crossb.pdf and b/release/darwin/Blender.app/Contents/Resources/paint_cursor_cross.pdf differ
diff --git a/release/darwin/Blender.app/Contents/Resources/crossa.pdf b/release/darwin/Blender.app/Contents/Resources/paint_cursor_dot.pdf
similarity index 83%
rename from release/darwin/Blender.app/Contents/Resources/crossa.pdf
rename to release/darwin/Blender.app/Contents/Resources/paint_cursor_dot.pdf
index 6419d10f276..a5eea954231 100644
Binary files a/release/darwin/Blender.app/Contents/Resources/crossa.pdf and b/release/darwin/Blender.app/Contents/Resources/paint_cursor_dot.pdf differ
More information about the Bf-blender-cvs
mailing list