From 60a827a2a9917c142a66e932e9009948ea6b7b78 Mon Sep 17 00:00:00 2001
From: William Reynish <billrey@me.com>
Date: Tue, 1 Oct 2019 00:00:06 +0200
Subject: [PATCH] UI: Update paint crosshair for Mac

This is based on feedback from users.
Only affects Mac for now, Windows will be committed separately.
---
 intern/ghost/intern/GHOST_WindowCocoa.mm      |   4 ++--
 .../{crossb.pdf => paint_cursor_cross.pdf}    | Bin 4069 -> 4300 bytes
 .../{crossa.pdf => paint_cursor_dot.pdf}      | Bin 4086 -> 4147 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename release/darwin/Blender.app/Contents/Resources/{crossb.pdf => paint_cursor_cross.pdf} (80%)
 rename release/darwin/Blender.app/Contents/Resources/{crossa.pdf => paint_cursor_dot.pdf} (83%)

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 7cbc0a8bdc063c064b643d4246895eed39035cab..4f658f3b722d931891881462c48917b9f7037f02 100644
GIT binary patch
delta 797
zcmaDVe@1aaK>gIohIxk#cwEcpH;HRxdo9v9dy}h#qlksswLOKy=*urv)tQBt&3uy;
zw(Wm%+`r4_u-rL;hs+#t3J0}q-s`dKW<K-Q>P^YaTaPE-O=@_`a%6^=2B*Z%X_j1b
z)UI<CopP1vD+sVMHGBEj@!FP$_cxq*ZX18FM%1vLN1cOlriFX`=Wi?K#tX<+&e2)C
zKc+%;%27?vK<)6{uV2o;vN@2YzCFgRRqwQ^hU%JB3C|fbvl*^yyizJ&Jxg!mw9`{_
zp4%8}oHjjZF@4qTxhfG$v(hUjnN0EAe|pzmueMNQ*Xp({%5$EaQk$2Z({^_1<ZC(W
zK8B?>mRDR3+x*&_Q9|{(m0x|5UeL)|i?U~Rq!@NfmUb>$`m9SlVX>&;G$uCB30c4M
z=5qV4)qX3`_2T>`+1;CLZwRKyELj-QCzroDdq>jUdmiuZJYMUi-%$3VB;Su~*(n**
zi*_2n<egsWe#i}2Hvf5<!H>4U-_`Hm{Z%hdx_^c%H7}*Oq$o8p7sSd>%HrWNRWMKh
zGPsP*%r^e#=MgGM%*-o^PcAJg&M%5jF3K-1o-D$vE?}w<qv2GVnUkVmXyImPY&6-6
zH;}{Fz{t?l)WCG|V%~Y$=EfEZ1|Xo2r@#ef7#NsX7@~_An;2S7&f!z7H!(9pmoqT6
zFh&<MHnuQ97c($3#WdI03`3o<DbO`&ZZZZs7$jza>`-G<3v&#GW|$5%HnTLF?7?pr
zZ<b<^WNK_+XknRZl9*y?VUV1hYGh$yX>4X_X_jPaX~$(lP>DjUf}I^#aY<rPNkvg=
Q8W+%`#$2kZuKsRZ04LKEYXATM

delta 544
zcmX@3_*8yEK>gB*hJ1$%cwEc<KI%7g&TZLJY^Ktt<({zA`RIYKg{ve=8J8;X-*5i<
zB}ae81_uwNc?mHB1xGdQC3YTI8@kEw!!5b&ii5dsiyj1TnQ?I5F~w6A8`#Q4TCFdw
z>{|C#epO`M=1C48*X%a2zAAO1(Bn^Yn0a>lbi?gQXE*$hW83&gnCG=Y_VimD?)Bf%
zy>@n1-1(xq-pP9yrI-y(EH>X{<mX{aF3K-1PMZ9SSDoKXAx6WgG&3hf!O+6p(sZ&R
zUm%B(nUR61v5Dd2F1~r%rUvE;1|Xo2r@#ef7#J9t8Ka9C8yOf*4(3;_H!?9nmoqRn
zGes9OHZ(Is7c($1#x&Q^1Vf#%k%bYuUSnfpu$Tq1Lye71F&uAfVr+<^*~H9rvc7;_
zylJ9IvT0(9MRKBvMOsQynu)1VVp2+Sa-wmfg{g^!xgD1cK_v>Y3U+o}#U+VFB^5=f
RX<Wu;hDKbfs;>TSTmaw<rT+i`

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 6419d10f276670c53c92c8da7a12d2046573de40..a5eea95423137e793d4c577a9510bb4c3f145744 100644
GIT binary patch
delta 619
zcmew+zgb~IKz-;$TfV~v9IfByGzsrmW|r`5o<e#@Na;&~r~iTu7ItLoUpxNz<73&d
z8xKEP32b97+JBtQW97E=)eWYZt1mrx?XPy}`PmH-6Fg$_6m?Gf-rzNAtZelPI_c{x
z=Qk;2%Z$`3(kUBl%yx1yw{@+Jb1N~L)8zBD$u<08iEr`s-6z=U<tv&aZ~u*EP))qH
zkHKqa=cA;X>YE)~jz*{OCw{!xbc9Lm+L66y5-dEO-d0{_^1Eceuv1pPe8mm<f2?!b
zE-Q3TTw%V_Ej;DZJCV8Wd%NdwN7O51W^Un1%}XgRDN0Su1+nszvbanY3=}}Lk)bI}
z$OtI3S%#6BN1z}vGp{5*xwNP_zbHN>zhts1ueyM#LX3t}X=YA}f}w?*p|R2AXx=~$
zV*{W8rUs^yxA4x_v;Z0k0t$HwTwsQQfw8dxx|p$%+2k5NwP0gILv$$v6JwwwP>nD)
zGB!pRGcW~Of}zgPcrquynw_O3hLnl135J-d0j4@r6XVH|{C4q%MkxkqiKc0mX67j=
z7RiRjmMJNgW`-7)CI%+SMg}Q%Ts8!iD8wq**>M$@Bo>ua6s4wd8Jk%eaH*=g`nz!f
E00rO46#xJL

delta 569
zcmdn2@J)U~K>gH-)_jK*1X!#6KI%>2{ogT5FNmvKd5JHVcI*22PoEzX&|bvgohEU1
zUBm{b$z?Yd6to{@zWyVygLBgwk)Qmbebe_y_CA+Bb$IgUn)P$0s=ZF#@Tm2Ohv#;#
zkebi>3|b1(oo|;nmZk98A68o<aAKxH?LRB6j*W*n7lzIZ71-+J(0+v{_VEjY^A|Xh
zTr3JtOwLGNA^A(9O;U|Z`M|wEo%kC+bN6$l=A{&u6s0ESf>`-USzM+H1_~hB&}_3K
zqW}+Ea#4P9apL4eUUhymg%}N|(#)I`1w#vWOVi0Scmp|%%!~|7jZF+Ef8?F7X=I{c
z00Ihm3S3}@fq{{Q0lJv6k>TW>d}{SZW`^ie2F4af=wil(7RKme1}3JM#u}Pos53UQ
zv_#iyY-|D+o9xBUr)7@eVq+5%3k)qL7Dkh&@!Q2)nx<Hq8YLQ8q!=2cSelro8m6UM
wnwuGz7$g~{CYq$$aoG@5q7bWKXUA1sl2}wyQIwj-Wo%|-$)&35>hHz{08px{Q~&?~