From c05f63d55a048e8fb307694bc6122fbee4c37f84 Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Thu, 28 Nov 2019 13:32:38 +0000
Subject: [PATCH] Set overflow checks to 'false' for release builds in order to
 bandaid fix recent master error

---
 Cargo.toml                                    |   6 +++---
 .../element/buttons/indicator_mmap.vox        | Bin 56692 -> 56900 bytes
 voxygen/src/hud/img_ids.rs                    |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 565625a42b..4c463c2db7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ members = [
 # default profile for devs, fast to compile, okay enough to run, no debug information
 [profile.dev]
 opt-level = 2
-overflow-checks = false
+overflow-checks = true
 debug-assertions = true
 panic = "abort"
 debug = false
@@ -46,10 +46,10 @@ debug = true
 
 # this profil is used for veloren releases, compile time doesn't matter
 # we need stacktraces, light debug information, as much checks as possible
-# i would like to put it in a seperate `official_release` target, but that doesnt share caches with `cargo test` and `cargo bench`
+# I would like to put it in a seperate `official_release` target, but that doesnt share caches with `cargo test` and `cargo bench`
 [profile.release]
 opt-level = 3
-overflow-checks = true
+overflow-checks = false
 debug-assertions = false
 lto = true
 debug = false
diff --git a/assets/voxygen/element/buttons/indicator_mmap.vox b/assets/voxygen/element/buttons/indicator_mmap.vox
index 900bb5cc70fa35a04994a0bd4847dbe0bfd4c885..f041c4c5f3fd9a34dcbcbef602ace0f0600f78b3 100644
GIT binary patch
delta 1405
zcmX|>J&q(r6ojMx@;@uHx@r&x1_lS<05}+HjKLu7BDCxwxI&!)A#o8Lgx2H&{ofXL
znQdTV@b!QgDW)bnU%ZGHucrU{z5C;1w|@Wa`_F%o^v&1LFFf?+pVGVM4{y@rz|SY3
z`S1DuhY!zR4UbQy7e2Jw-5oHXSG@L0w_f>XHQlr3`>e#>bRS+3FN4x`;C|2u%57GB
zLs6!n-u-KnN}~cPo{iGQC|?c5hGL_7>$vMR-aAF`cqWkVKmGmbIw@SM!ex@jNVpb-
zbCpLlT%6+3DV?11*=gilu8w|A6NdeDR5%rR>K&TlJiyBeN3VGBN<8z)Ydm|Ei&wpR
zc%wWVceZei{0hlklENV<fqV=aPeJ7zR4+l(HK{*j`D4~_9OX`<3=Ql#QXi?0)JN(g
z^^y9Cq$U!bNH!|&1K2TmBH4togt3INgt4TxAYKufZaY$G!H#5F2oA!Iv|7%YBr-{4
zlE@^HNg|U(hBr~OBVkYd#B*XR6^x3QP3KYhGHN8P!u0hP*jS*pvfi@tD{>eg2i8|u
zUtxWP^%V#OLV+-X3=)W-Dqbq@MP=GbZKc)`y(L~lyis8v)$fx$6AvWl7{HLAWhH_2
z^an?(t0PuRtd>{}u?C0%Vw4914cwuXCxyT}=Rsgv$CMTm2GaxPddzhs&@x$z!4{(}
z33hkOouOu+wujTf?da3J_VHiPEO6l{uoM~y1H_(Y9nCtLbw97&6ECXcZ1-N4y<1Eg
z;Py_I7tJt{W75Z+!MNjY0Df<o*fF^y0Z$U1L^7NNXJNGqD_>am%<AUXRaS<Z7;eXK
zkIl>sx2#OGU}nL@g1H5g3ub3b&zOJwD^E;SNveSH-q5_Ec|-G{27ZHpV_=JbL0~|j
zN1#KX#e}DSL+^&a1H6Dni$;gW+9NU`Vi2(iI0`%%w?<`aRku#l)@!#7nm40mv%u+T
z^B{l-63AfWu7FDI1ZM|#rpH3Rg?>-+Ab<$c_OvQ<;V7~c8%P7>o+cg5TADTp2_YdQ
zgoJp5i54>*rh3c`m^7HRn0A{G5h6lFhzN}zzkB=g*}vbF|Nnk`k^cIz|Lyh<mvK*L

delta 1173
zcmXYvJ&x2s6okum|Npq{S&$GBN8kzs1RDSW5?Y9ehzQB&5J+5v3=whw=GT*O22a2N
z_;$reHEp}A-g{NuzkUvXe+=7qZ|<Ibll1Dv?Q0f&{3E@+{qVBfzwmnmy8r9l`wzFD
z&HY#DDIcBYs|OYgO3R>p8B{J#)3s=G-6*p+UCjg1*(fiDeWMD-%SLGnsX%Dg@KB^t
zXhf7wR{3mI77N)zwrZE2y+QTbD}nnpgK~9BN2h#pDrcv<IQS0!q_{N2^Q6FVaTyg)
zO@Tq;*()8qKINlVIeAq+jEhI)HQ^#GRq;3~An*(lPX=L8JOrhEP-ZR1pn3`#&p~Yo
z=&Ax5&mi$=(HgW_asTys_hg$j?2E#o$Q-KtvC2Yrr=+}3Du<+cOd5G_=cH+wh-xCz
ziD;A3E`k~7nP@XZWQNELkr^U0L}rN05HqQCU?!OkzK1`nZh0x3OJab0EVwSXF1RkZ
zE(j+goryRgm{=!{rGZMkm3S-hR^qM1ThT<0EW&M^?+6ml_2D_4Mviaf_(qOzgg<KA
z_?scj3^C(iMld5z=f=foxNVRdWKYbFC@oPY#a+^{%L+I)B<L|<Nzf60<S2%{Csj|X
zj#M3~T2hVZBD$mi%r0-__niVML@r$b@oO6%Z;N^ycR1-7sAI5>$a*f-z(q7%PRpfp
zTr>{?h@=!i<hy6z!L#rUx`A3fwR&px)ao%iVA_z7#jGP$&%WCQIgZ_JnbHEk^Kx7&
zizAQI`%TN_o;?G?&f(bO+><~ci9jL+O-6I0vfe0zv~Dzly3T6rq-kxM*HN3bf})!>
zg9IW7+TN_52gjxb2J(QYN8C}UqmU>rii_e=qJU`NY2avJX<%qD(4eP5#}I)AqPTdD
d=psEjdi3-d=waw#>EYH6HxR=5{fqs5`3HhW703Vp

diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index eee2ff247c..b4b37616e9 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -59,7 +59,6 @@ image_ids! {
         // MiniMap
         mmap_frame: "voxygen.element.frames.mmap",
         mmap_frame_closed: "voxygen.element.frames.mmap_closed",
-        indicator_mmap: "voxygen.element.buttons.indicator_mmap",
 
         // Missing: Buff Frame Animation .gif ?! we could do animation in ui.maintain, or in shader?
         window_frame: "voxygen.element.frames.window2",
@@ -122,6 +121,7 @@ image_ids! {
 
         // Map
         map_indicator: "voxygen.element.buttons.map_indicator",
+        indicator_mmap: "voxygen.element.buttons.indicator_mmap",
 
         // Crosshair