From a18ff08453bac2a8d15edc7586e9d19e2773a194 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Wed, 8 May 2024 21:17:02 +0200
Subject: [PATCH] minits progress

---
 armorforge/Assets/Scene.arm       | Bin 179367 -> 181915 bytes
 armorlab/Assets/Scene.arm         | Bin 147630 -> 148682 bytes
 armorpaint/Assets/Scene.arm       | Bin 179367 -> 181915 bytes
 armorpaint/Plugins/kfile.js       |   2 +-
 armorpaint/Sources/tab_layers.ts  |  18 +++++++++---------
 armorsculpt/Assets/Scene.arm      | Bin 179367 -> 181783 bytes
 armorsculpt/Sources/tab_layers.ts |  18 +++++++++---------
 base/Assets/World_irradiance.arm  | Bin 124 -> 135 bytes
 base/Assets/shader_datas.arm      | Bin 17251 -> 27851 bytes
 base/Sources/base.ts              |   5 ++---
 base/Sources/box_export.ts        |   2 +-
 base/Sources/box_preferences.ts   |  15 ++++-----------
 base/Sources/box_projects.ts      |  12 ++++++------
 base/Sources/export_arm.ts        |  30 +++++++++++++++---------------
 base/Sources/import_arm.ts        |   4 ++--
 base/Sources/import_obj.ts        |   4 +++-
 base/Sources/nodes/float_node.ts  |   4 ++--
 base/Sources/nodes/vector_node.ts |   6 +++---
 base/Sources/parser_logic.ts      |   8 ++++++--
 base/Sources/project.ts           |  21 +++++++++++++--------
 base/Sources/tab_brushes.ts       |   6 ++++--
 base/Sources/tab_fonts.ts         |   4 ++--
 base/Sources/tab_materials.ts     |   4 ++--
 base/Sources/tab_swatches.ts      |  12 +++---------
 base/Sources/tab_textures.ts      |   4 ++--
 base/Sources/translator.ts        |   2 +-
 base/Sources/ui_box.ts            |  11 +++++++----
 base/Sources/ui_files.ts          |   4 ++--
 base/Sources/ui_menu.ts           |   6 +++---
 base/Sources/ui_menubar.ts        |   7 ++-----
 base/Sources/ui_nodes.ts          |   2 +-
 base/Sources/ui_toolbar.ts        |   7 ++-----
 32 files changed, 107 insertions(+), 111 deletions(-)

diff --git a/armorforge/Assets/Scene.arm b/armorforge/Assets/Scene.arm
index e71f0cb760a7e688fee8b5054ec114da2097d9ce..9ffb0ccf10b792dc8ee50e11167d3b8a867ba148 100644
GIT binary patch
delta 3784
zcmeHKOKclO7|ys!94BcKKi03jAGMv<Nn8a)MdPGR8ic4&c&MmCiMA7aW3OWGI=h>s
zCxR+2NR%9YV1#-AsYq2NKtNP1Acv(=BosjpIUuAJq!kZwK%y0gk}9g0*_gx@Z4~>$
zA-z~L|IGg1{GY%1X6DL9^`(n7mi2?5TE-mqw4f&WIM%TGV_jKU*}4__x_iPl+EimW
zCGeVXehtx{QB8kDN!73v6QzW1l(Q+*qNKyuBN5UTL!C>TBNZ*=PCxRI@1nFDovf&5
zU5-o-qTtdiGnFmmgD`3&t_X50&37O3TPWNZ^1`)6XNi#BYop;j$ailYa_2$byZcl)
z5Ax^5-@7OzsS6@6ndw4YQJ`d|2W=Hf-aLd>c2G%l09oG&BYp>psD0@D98_^^=An#)
zia_xaqr3Ei{yw}%D6m^SWHDSi(uX|-NFVj0ssGYOQG8^y4;811JnGIx3Q!*Y2buNU
zJz9D_1ILk#H20%r@?w-K{nY>}H`UKX@u12kY|ZeAt(?qvq54wg_wC~a)jfp630osc
zJW+aOuN^Bu*@Z)f)cR!UNR-2sz0pUO2hfqCXru1r%#KA-5|PVc)MR=Ou|!db?anU-
z(cxmVMY7cEUT!6ScIUEX?+>Dzoy^MYRwr4!fEvi9FtQcqT^-IY4eh~0v!|n$ss(bp
zJ7<&G?=K+xm+l&Bwka`@)N)qM9C^J0ZU#LN4V{6FK%K3UhDLB&P{11M>{zWT`)1fU
zKx0$#-0HbsBSQw8fYpo;)7EIK41Nl^Z56a3D_T;9(~jrixU&T|IVXJVcmsH@9>!4(
z+;IBf2fq`l{B^M5uZ8!Vy=<(uihlVl)&xbwDY)TkhO15N!;_Wf(rhs9I<jEY(n+&C
zj>i>2Rn1d_Mdk`3>|9BU5<exTXg1yCD2)@_{e$LsCXF-Op#~aC2$G;sd_FC*F;zFL
z+Y?oNomCETZrH5jo~y2!Rj(#-obqGu2+);Ygca@?<bekF1l;jF2XFhG3%cRhp2klp
za++7=StTZ1H!GP;2~s>4(G5GDxfO{EswPTU6J<#^>bJvkhAq$xvaC3jNn*Y*ho>+e
z;tNu7g`@mVLO9{$d|Qi+$thXk=M_;CR6d~y0zHuRHur-@%@ycy!aD&c+c>z|fuX%~
z6Ml0$EbAV?oCof=o`RWxy70fUz{dmmgzn0M0w=wkM>m)v;zCAC@>tVwESVN0O{Y~p
z4bk?q@VU>_uZwA5PChTBRP*+d5~XP!ZqdQ7{1K{zKm3za2`zB8=_tJAckLH7xOd@?
zsbmzcG&WHl+hN=@2)8{IOfm3!Q-5yr^tZmW|29u=^WxH9&8N`6+5*wV`AtC?%&<i2
zU;;lYiBqzYzP`_Q*MW}59{KDepY^%mm%xCXT^v+R5u}8cTw{+&7z$!&3%0>$L2rP)
fK{Hs<#29^hn$J?*+)(u1f~N%~7a}h#Th9CgfprSU

delta 1690
zcmcJOUuaWz6vuN;8`~P2CO1vfrcJ6<v8|P)Oz7CehEc8a53OY=D6<Xi?H@=}cAL71
zvW*ROFHR(|?}L93gqekOQX|dOQCw|B3R9^M%7SJJ8-3XHNyk9xe!r&EbmoE&?&1Ep
z=iGBX=X-wloa0AKXa8QzDbonIDEK47Tc8ZHf^9KAf`;$d&8eJl3zece%DYe)Wv4ln
zV=x$!x#9@=`_*v0VuNFt3-NQ5H{!4JY{t6FY&UlI1=J+Ij`3EUigLv_F?MC3T`_j!
zml$s*6K+Jg1n0)M8Eq3>jGI^3kMU9A^ZdlmacEc&M$WSxv)^+wr_At;^KKd147wuX
zuV3X4WxRsf2{xt`oQksvZDYdcALS}sn&1WrGGln0J1`k%FBRb3D3_t=0>A&F?gnfe
z<%)E1k*LZXC-z?8dfXl5w_eq{=^`I}S(^x+%j{0vxyVhFuD3tIO>bCz*BGyTRmuN-
zYks^l$?GsP$xHFoBzO4o#Q+S3G&R^0>YbL;kSq|##{*iRt6fvOlSX0flvdIt-U59+
zy`lClf5<<0kA$5n!0cIegx%(XJelm*RD2QP<;wITVI}2=br0;FmZ7jmcn2*)Ai||f
z=08kz{N`=Mml3XREs~+y&|qk&zrAxP5a<i`jL((q45)ssy>lQipxu)trnJu1_5VHw
z!{?33#lqXK4))ILG7B@6du+8cd_c_fNDY<8ukLx<37ds%sIrn0zM;6{IW~(M+ZEwD
zT}wu^)Q}xsJLSfk>Mcd`L#gzY#Si+dZnP<+%*AmkSFTamzHgrVY-VP~f5<2Hwbo@N
zyT0|7WRO4oaeLhYGJY?lHQ2C>%AqZz(`Z_e7VN=cGu_IDgt?qPk_?9wc09+4hqB3R
zh(7CUAP}|bDA-c`8tGwco&#q}#7$;XQ0LG=tSQZC!kSlxLuEQm6gqVf3+_RxP%Cs)
zJgU$^Ja)ZQ0Z%1)vo>+NQYSsL37K9FPnC{@AF6a1nO&qA#Vd6fCs*n)7PN7H6|GLU
zaleMD@kEZh+<?TUYU(91Gsv%{+PR2C$!7X>`HPv8OX5q6)KWtwr;Osq+F%NjB|oHo
mGWA{}-iQYlDo!Wf{gbSh@KmnI{C4>gXM&Xf8Je&02mb&kRubX>

diff --git a/armorlab/Assets/Scene.arm b/armorlab/Assets/Scene.arm
index 4f4bed38d97ce101065586b2238c078ef524ecbc..c731ba9ce5a261d159b03ba1e0f5cc0597bf7458 100644
GIT binary patch
delta 1750
zcmc&#OK22H7@qDindv0+%wwX4!6?QEyKBTf#5K6a^$`UT7Isn4ZOfjTnKu2Ht*UW%
zXCi|KVMV<7ALg<v2<rnBA+!+i)MOQx>_N!UMg|YA!g$l09=57yh%@3Nc+g8z_5FW+
z_5EM{U3K%cvT#<BYmr&G7D||y=G6>hh(7EH1Ol}XtnT~r3xyA<h77DS{Oh8`XI>Zo
z=oV$j(sV25dMiZAv~Ic8N>Cnyt>tyj)2}+xaJoF<Y&_5r<AZ(}pV{D?IMSJhTcy?2
zJJV9q(fY<$@qMANVh}EsdaG((il*Pcfuoem5;&zHp8@WdMg_q^DFuJdEQ{c^!trx=
zlfJ^O7qQ|id{W-vJh+-ws-!M8CH_0JCMtF~Ji89AmlPo}0+rd$l^?cXZq$%MmFmxR
zsUg;JX5+UxS9Nn;nq1EM+d;YE;oQq%xoIMoI5)9b?u@<GICs7-JxUF9^D{8?T%I*g
zQ21Eu09#JM%j7WZ@BLZ|L8W&P?j?sO7s7#mc6vdclC@7R9D6+Wt=GvXh!(KM7WpXP
z#YB)4DJz<)Rx}KL(DR;X3!AXK4PNL#msmpcD1!;yQP#pY;VJkdJk$!yJ?mj1ya)bM
zqL5b76|aXcDXJ)wA(&FXcLZ{>4H4Fwx}|1ygJI(O-DaZP(mdkF3nnToL2(Y{u!RX?
zST%JKqplZPN~CU06bqBecW_DB&D&*Lc;$tzeQ>$^V8t&rhiwxx@|)Ty$n}yuzcE&`
z#5PrG7m0@F{R)m7*vd2!*Gurs29m*)=@w$TZMi;c1GWo7m=6k8WEAp9UE=tj)4E>j
zjX)b!{~N&;LQ%P98#YmYAv(iUB{<_kG@jbq5Y`quZWQ@eLPHzu3u;YAj3F&=VvA81
zHpTiS7pA)Yf?)TRB)<b#kzloG>5M+)OaXY&y+s;;(VnAlG5TZWllk^`+a_9%;A4Cn
zYc-<j>3e;H=h36wp5LJ-GUWUe*(LS0d*uI!K}aZTSMi@{+Vw>L>b#+S6SFok=W8k0
zuB1SZ?SfZv`nfF}S)PUPJVxL}^a$LDO~JMJp|_WPDn2+Qo`-jo{x?{O0e&%^NsJ`I
zJdHAftsKiQiZ$>of#7;#4XDY%kthcWh%jB_FOmO9HJs#E7MjMS2~`j8kbn3eAK`9j

delta 961
zcmZ`%Uq};i9N&H0bZc`?EjMk66pA2G5Sz=X(<vE5BxQ!Boael42e;jMcT@4jED3@n
z;)w5SJ!q5_#2yZMD<6VE|3+_zED7l;st4&!`u#RtLiBJye)ql4-{0?YcN{Mk9Z+z-
zghD0$2*4l?1>stwSz)nQ)Fd~>E9OD69TetM5<A6d96k+#U;j{P!*5}z!tEfOWdOT6
zpdB|m;GBOSv5F8ca2l@&oLJ(vg$UY#QV1q-F$#y!-vcUs?*xB61#A4AmQi>%lNK~}
zgA6Qa55r>|=>j)?4M8`)4#R22iQ8cqFALoB{mW$tx4_U?O~zUe3@}vV60UW_7!=$X
z>4oc*KZw~rn2!F34@AVYk|oWh_~MDoNOQcXniMajxI{5&TvAf&_%;forJT=tfva~C
z#H^%<Q^nruMlp{S7y6+Uy#vtfv=M-;NRxcQMyFmh`eCBiPNu4+@acq>%u{F6Q5I78
zxJg-8sjNv2L?MyX_8Yi#37Q)yk5hQAh>3Bk#?p(FX4mm{0FKq>=?$3&$P$-k@-!Iw
z$ozzh>`FkDofJ4V=QTcsOm}&j;$&78=J`CCSnx~$0!#%;0r0tYwQ>_%ry|s&ZK#?+
z;z~x<GATBe5k(=LcvFfa@|?oPBvDc}XwIAx8|vA6ES4LQ;@_6y)#Pq3+PGl7-`=RZ
z>~;Etd?b5$IMk@$#5&!xdNQlqJx%zt6MXuZ)R6t$>Z!(uHpZv#khjCZnkM|!30^2z
zb=m6ESJFiVeOYe9r52_xyOo}2=*NqUSAQ>;<R4(OyDWcY`eW^1`H>~rQIda7<bN+u
zJMfW>A@VleSUKK6{@z^F$VQ5Hrp7ptXJttxC#;XlO$N3wo>wJX&+6y`A>oq((?=^A
n&ZDsD)o)=f?PQ$)!t5($+}&aJS`l00T@}<+Q(qs>48ZUo;><Oa

diff --git a/armorpaint/Assets/Scene.arm b/armorpaint/Assets/Scene.arm
index e71f0cb760a7e688fee8b5054ec114da2097d9ce..9ffb0ccf10b792dc8ee50e11167d3b8a867ba148 100644
GIT binary patch
delta 3784
zcmeHKOKclO7|ys!94BcKKi03jAGMv<Nn8a)MdPGR8ic4&c&MmCiMA7aW3OWGI=h>s
zCxR+2NR%9YV1#-AsYq2NKtNP1Acv(=BosjpIUuAJq!kZwK%y0gk}9g0*_gx@Z4~>$
zA-z~L|IGg1{GY%1X6DL9^`(n7mi2?5TE-mqw4f&WIM%TGV_jKU*}4__x_iPl+EimW
zCGeVXehtx{QB8kDN!73v6QzW1l(Q+*qNKyuBN5UTL!C>TBNZ*=PCxRI@1nFDovf&5
zU5-o-qTtdiGnFmmgD`3&t_X50&37O3TPWNZ^1`)6XNi#BYop;j$ailYa_2$byZcl)
z5Ax^5-@7OzsS6@6ndw4YQJ`d|2W=Hf-aLd>c2G%l09oG&BYp>psD0@D98_^^=An#)
zia_xaqr3Ei{yw}%D6m^SWHDSi(uX|-NFVj0ssGYOQG8^y4;811JnGIx3Q!*Y2buNU
zJz9D_1ILk#H20%r@?w-K{nY>}H`UKX@u12kY|ZeAt(?qvq54wg_wC~a)jfp630osc
zJW+aOuN^Bu*@Z)f)cR!UNR-2sz0pUO2hfqCXru1r%#KA-5|PVc)MR=Ou|!db?anU-
z(cxmVMY7cEUT!6ScIUEX?+>Dzoy^MYRwr4!fEvi9FtQcqT^-IY4eh~0v!|n$ss(bp
zJ7<&G?=K+xm+l&Bwka`@)N)qM9C^J0ZU#LN4V{6FK%K3UhDLB&P{11M>{zWT`)1fU
zKx0$#-0HbsBSQw8fYpo;)7EIK41Nl^Z56a3D_T;9(~jrixU&T|IVXJVcmsH@9>!4(
z+;IBf2fq`l{B^M5uZ8!Vy=<(uihlVl)&xbwDY)TkhO15N!;_Wf(rhs9I<jEY(n+&C
zj>i>2Rn1d_Mdk`3>|9BU5<exTXg1yCD2)@_{e$LsCXF-Op#~aC2$G;sd_FC*F;zFL
z+Y?oNomCETZrH5jo~y2!Rj(#-obqGu2+);Ygca@?<bekF1l;jF2XFhG3%cRhp2klp
za++7=StTZ1H!GP;2~s>4(G5GDxfO{EswPTU6J<#^>bJvkhAq$xvaC3jNn*Y*ho>+e
z;tNu7g`@mVLO9{$d|Qi+$thXk=M_;CR6d~y0zHuRHur-@%@ycy!aD&c+c>z|fuX%~
z6Ml0$EbAV?oCof=o`RWxy70fUz{dmmgzn0M0w=wkM>m)v;zCAC@>tVwESVN0O{Y~p
z4bk?q@VU>_uZwA5PChTBRP*+d5~XP!ZqdQ7{1K{zKm3za2`zB8=_tJAckLH7xOd@?
zsbmzcG&WHl+hN=@2)8{IOfm3!Q-5yr^tZmW|29u=^WxH9&8N`6+5*wV`AtC?%&<i2
zU;;lYiBqzYzP`_Q*MW}59{KDepY^%mm%xCXT^v+R5u}8cTw{+&7z$!&3%0>$L2rP)
fK{Hs<#29^hn$J?*+)(u1f~N%~7a}h#Th9CgfprSU

delta 1690
zcmcJOUuaWz6vuN;8`~P2CO1vfrcJ6<v8|P)Oz7CehEc8a53OY=D6<Xi?H@=}cAL71
zvW*ROFHR(|?}L93gqekOQX|dOQCw|B3R9^M%7SJJ8-3XHNyk9xe!r&EbmoE&?&1Ep
z=iGBX=X-wloa0AKXa8QzDbonIDEK47Tc8ZHf^9KAf`;$d&8eJl3zece%DYe)Wv4ln
zV=x$!x#9@=`_*v0VuNFt3-NQ5H{!4JY{t6FY&UlI1=J+Ij`3EUigLv_F?MC3T`_j!
zml$s*6K+Jg1n0)M8Eq3>jGI^3kMU9A^ZdlmacEc&M$WSxv)^+wr_At;^KKd147wuX
zuV3X4WxRsf2{xt`oQksvZDYdcALS}sn&1WrGGln0J1`k%FBRb3D3_t=0>A&F?gnfe
z<%)E1k*LZXC-z?8dfXl5w_eq{=^`I}S(^x+%j{0vxyVhFuD3tIO>bCz*BGyTRmuN-
zYks^l$?GsP$xHFoBzO4o#Q+S3G&R^0>YbL;kSq|##{*iRt6fvOlSX0flvdIt-U59+
zy`lClf5<<0kA$5n!0cIegx%(XJelm*RD2QP<;wITVI}2=br0;FmZ7jmcn2*)Ai||f
z=08kz{N`=Mml3XREs~+y&|qk&zrAxP5a<i`jL((q45)ssy>lQipxu)trnJu1_5VHw
z!{?33#lqXK4))ILG7B@6du+8cd_c_fNDY<8ukLx<37ds%sIrn0zM;6{IW~(M+ZEwD
zT}wu^)Q}xsJLSfk>Mcd`L#gzY#Si+dZnP<+%*AmkSFTamzHgrVY-VP~f5<2Hwbo@N
zyT0|7WRO4oaeLhYGJY?lHQ2C>%AqZz(`Z_e7VN=cGu_IDgt?qPk_?9wc09+4hqB3R
zh(7CUAP}|bDA-c`8tGwco&#q}#7$;XQ0LG=tSQZC!kSlxLuEQm6gqVf3+_RxP%Cs)
zJgU$^Ja)ZQ0Z%1)vo>+NQYSsL37K9FPnC{@AF6a1nO&qA#Vd6fCs*n)7PN7H6|GLU
zaleMD@kEZh+<?TUYU(91Gsv%{+PR2C$!7X>`HPv8OX5q6)KWtwr;Osq+F%NjB|oHo
mGWA{}-iQYlDo!Wf{gbSh@KmnI{C4>gXM&Xf8Je&02mb&kRubX>

diff --git a/armorpaint/Plugins/kfile.js b/armorpaint/Plugins/kfile.js
index 4d9ca9e5..93106c34 100644
--- a/armorpaint/Plugins/kfile.js
+++ b/armorpaint/Plugins/kfile.js
@@ -1,6 +1,6 @@
 let project = new Project('plugins');
 
-project.addFile('Sources/**');
+// project.addFile('Sources/**'); ////
 
 project.addDefine('WITH_PLUGIN_EMBED');
 project.addDefine('TINYUSDZ_NO_STB_IMAGE_IMPLEMENTATION');
diff --git a/armorpaint/Sources/tab_layers.ts b/armorpaint/Sources/tab_layers.ts
index 287c8160..c2d7b628 100644
--- a/armorpaint/Sources/tab_layers.ts
+++ b/armorpaint/Sources/tab_layers.ts
@@ -214,7 +214,7 @@ function tab_layers_remap_layer_pointers(nodes: zui_node_t[], pointer_map: map_t
 		let n: zui_node_t = nodes[i];
 		if (n.type == "LAYER" || n.type == "LAYER_MASK") {
 			let i: i32 = n.buttons[0].default_value[0];
-			if (map_get(pointer_map, i) != null) {
+			if (map_get(pointer_map, i) != -1) {
 				n.buttons[0].default_value[0] = map_get(pointer_map, i);
 			}
 		}
@@ -322,7 +322,7 @@ function tab_layers_draw_layer_slot_mini(l: slot_layer_t, i: i32) {
 	let uiy: f32 = ui._y;
 	let state: zui_state_t = tab_layers_draw_layer_icon(l, i, uix, uiy, true);
 	tab_layers_handle_layer_icon_state(l, i, state, uix, uiy);
-	zui_end_element();
+	_zui_end_element();
 
 	ui._y += zui_ELEMENT_H(ui);
 	ui._y -= zui_ELEMENT_OFFSET(ui);
@@ -439,7 +439,7 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 	}
 
 	if (slot_layer_is_group(l)) {
-		zui_end_element();
+		_zui_end_element();
 	}
 	else {
 		if (slot_layer_is_mask(l)) {
@@ -463,23 +463,23 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 
 	if (slot_layer_is_group(l) || slot_layer_is_mask(l)) {
 		ui._y -= zui_ELEMENT_OFFSET(ui);
-		zui_end_element();
+		_zui_end_element();
 	}
 	else {
 		ui._y -= zui_ELEMENT_OFFSET(ui);
 
 		let row: f32[] = [8 / 100, 16 / 100, 36 / 100, 30 / 100, 10 / 100];
 		zui_row(row);
-		zui_end_element();
-		zui_end_element();
-		zui_end_element();
+		_zui_end_element();
+		_zui_end_element();
+		_zui_end_element();
 
 		if (config_raw.touch_ui) {
 			ui._x += 12 * zui_SCALE(ui);
 		}
 
 		tab_layers_combo_object(ui, l);
-		zui_end_element();
+		_zui_end_element();
 	}
 
 	ui._y -= zui_ELEMENT_OFFSET(ui);
@@ -936,7 +936,7 @@ function tab_layers_draw_layer_context_menu(l: slot_layer_t, mini: bool) {
 			}
 			ui._y = _y;
 			zui_draw_string(tr("Res"), -1, 0, zui_align_t.RIGHT, true);
-			zui_end_element();
+			_zui_end_element();
 
 			ui_menu_fill(ui);
 			ui_menu_align(ui);
diff --git a/armorsculpt/Assets/Scene.arm b/armorsculpt/Assets/Scene.arm
index e71f0cb760a7e688fee8b5054ec114da2097d9ce..53b3f63913fad1a3bcf98e8722e2303c954e23df 100644
GIT binary patch
delta 3785
zcmeHKTWB0r7|z)y*=&*~*~{!L_e*!P?Izh0#bUEblQbe0i5DtG5~e4+lieY^Gn<)7
z(kCOu7onPmA3TT;3JRs5qK3Mtc^C@;3EGD|h%jhcyx@aiiw`v=6wjHg$!=|Hc15Jr
zmtoF-&ivo`zxmF0&N;tXP0rO=HuisL8F$#zf|}&xSi|bKb!BB`8&>EG^@MHoRgK}4
zz-z*pbwpc6HGPPZs$nT6N(tR4XG3O0Nr%rzBcv^cI+wRbD_Y3)e&i!xMQJlSRZ-8H
z9GMwJ!Q~fbD_h7rVbn-m5#(522p#cTDBL*m!o?+LiIColW8pl=*RLLM=Rw}Q@mM$y
z^82NqyC@{73nDL>?Lu5ppk%fOZ5K*jJ%CnsQAu<FSzikyeiw?Uedw(mRB>$Pp^SDH
zf#M}bsPuw<Ke$IIuv<N3DO@_zyFCR+@AabTztTogd}OQ-6{m_k>P|-rQ11SN%zADd
zF1?<CqsT^@`_T${HcFNLVgQw!>Sv<3Q)QF3X86EXP8PaQeW~*M^5KH&?!w`ut&t=i
zDZR3njufEWgF}YY`e^A$l*84%(MMJW(4nGeqweI)jz>`vk+;LB$@Cs#iK1?{IzJgi
z2aC-X$x^R-zLoqM%4N&m8bnt*nU&eCPO@|sHIO&L$X1wlZ6v!qv<DB(o`_ni7Rj|x
z&L*>8pGEdh-8Ix~Q(_{i<*b@H@<s(*33?#feG)bUb+$?x8pUZr0c&?>$68g{7bC_#
z8k?5q*G~T!88X-atY(Cmwoc#5;Ja?Ot%APDik6h&gyU&A>TH26&I#{3&H>NW!vv~<
z%T6DB<99-pzYaG2weY61m-W?F(J!CGnxKd{1(#jTaG{BPI9zE?%?1;$LyJZ&9W=+|
zcw7-w)!a2$WWFH6_La0K@zY|8X46fM(m1ix-f#A2(m1mdYM`NnAPEY^=hGtVQ+30-
zGf>qxSmhAsM$9^Hy6UP~^=cBwDL?j(0G;V8u*yAw+|b~jgzKKC79BeS_-RE>^Qt_j
z#Dq&`4O1yWisvG_VW%UvBXL31L<wu6Ea^u5PFT*cshL5R6{j*u%opbH+!l`q@>6lQ
z_3kEwV?NHO8!T;1PRR<tpop5F@(D!{=vJ(^x$o3#&OnD_-bom4<KRLEhW5@a_{r_C
zY<K{39=O$d9A*RR{lkI+!(Ps#8%zsvA)_UEtZ6uwObe2x(<&c_X!|Mn*k>x&#s2=h
zd`3vA=D8&$N;5iKrJbMoBUA&w_@}4_THsXE;YE|%ZKeDdLI@UU>R%Ir`ySLWfsDcV
z#wJQ(J4|>6;hLv{i3MJ6>d&p1{?_O2AFcfJ71P_iwESE1arCF4Ky-0_Q$+^zCy^SK
zz|TqIw5+5rJ>W}fU&lianyvobYWm-9O}ll$4}k$YJ2|MDB1j1>xz28pFciel7Hor$
jg5ChTgl4d!i7|TlH1DOlxy0zf1<wddE<~PLv7Gz^EJX;a

delta 1644
zcmcgsTTD}D9Pjt12(|0&^h#;VM9BbQl(~dGEJ7BhMz;Wq(dff!2M1`<%Q&>#OqN|U
z_OeTsCi^X!x5Pwi*DBaag@{p+7ZQnaFUuONnrL{~)nrSSjBVecg*7epZ9bfn^Z(BO
zclrM3_Z@tqKK<uL%Bm-*N5GFU+5;g;0$xtgr|39CF3MI!dzcN4aXJW1ob1|cg+igo
zDETeu4T#Zp!3b-TG`JC`9oRoZS}aeKxpL6w7c=-QK`-H0oE%>!$XP(`OppsdBxpBN
zV<Ao!yndN>;+b<4!SQikeshJEF_z?D!wi{`yhuAKtHrr9WW~Zbb<3?LES{%rIB|(a
zbQ*3aEWQ<vNTMea^r2^lll(nHYC(SE3wVcC)(1mUU>3R*9e`zmf*4Pco2hU&MX$+>
z2jG|_N6rCns)z0>ZO8jbs)P4iYRB10+E#4X1l1IMZYwen9$jQyILq+sG`Z4WO;I<K
z_oGE$n!EpBH`Q>No-KCyIL8{o<aK%;19S8wlyh_l53iH(w2F`8&5-0D@JQldrjl3t
z<tn4*Pk!IfaM&~84SVxrQ{kV}WR1GCswz2XUP;6UG1@HL+Q6%f9KgZQ8@J>M!yKc1
zYy<o;vOST1F@Na3yAvPAsIgZkw@Q)Ga3tXAkNEw*;Lx=d$$r1+l|20+e@I%CCFZ66
z-tDWGLh)W_W+Pt>h@-=KUs_&fm0xVNN8jd&pJ-yWso7Vbv%{!oM${Xa5M2<QsS2as
zh2Jhv4SJiH32rk}rn=kpI`mED)@-Sdx(qHnyg)XlluuUFd^k_{*V59KBDy1ods~X>
zoTuED0=joD^|j>b@Ib>_@!}>{3uzNOf$l9iYi;;g%Wf9&KwHa3@XFMRkFP82xF>I9
zJ+RO4NHF5YGOBw_j|4^yRaTs|F!Q>qE!I+StL;C_hN>Ej)s(TUv6q4i_bV%ljxx$W
zJ4(U7IM<ZXR>$1yTK=xC6j)$c2G*jjzKra}`cia(=N#J9PzHUpp%h(c`u0<7YtHoT
zCf11Gg?wt$yBgUrqpT9u&8&H)BW>Bu?rdI5j~wi-^h7i3sH1Ep|7b?2gG^t|f4B25
lq*I-^tLI6VgOmRLCuW$&9|99rPefPxWRO+Ai`hBa`!B!{4B7wy

diff --git a/armorsculpt/Sources/tab_layers.ts b/armorsculpt/Sources/tab_layers.ts
index ffd827ab..15f31be6 100644
--- a/armorsculpt/Sources/tab_layers.ts
+++ b/armorsculpt/Sources/tab_layers.ts
@@ -202,8 +202,8 @@ function tab_layers_draw_layer_slot_mini(l: slot_layer_t, i: i32) {
 	zui_row(row);
 	let uix = ui._x;
 	let uiy = ui._y;
-	zui_end_element();
-	zui_end_element();
+	_zui_end_element();
+	_zui_end_element();
 
 	ui._y += zui_ELEMENT_H(ui);
 	ui._y -= zui_ELEMENT_OFFSET(ui);
@@ -305,7 +305,7 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 	}
 
 	if (slot_layer_is_group(l)) {
-		zui_end_element();
+		_zui_end_element();
 	}
 	else {
 		if (slot_layer_is_mask(l)) {
@@ -313,7 +313,7 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 		}
 
 		// comboBlending(ui, l);
-		zui_end_element();
+		_zui_end_element();
 
 		if (slot_layer_is_mask(l)) {
 			ui._y -= center;
@@ -330,16 +330,16 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 
 	if (slot_layer_is_group(l) || slot_layer_is_mask(l)) {
 		ui._y -= zui_ELEMENT_OFFSET(ui);
-		zui_end_element();
+		_zui_end_element();
 	}
 	else {
 		ui._y -= zui_ELEMENT_OFFSET(ui);
 
 		let row: f32 = [8 / 100, 16 / 100, 36 / 100, 30 / 100, 10 / 100];
 		zui_row(row);
-		zui_end_element();
-		zui_end_element();
-		zui_end_element();
+		_zui_end_element();
+		_zui_end_element();
+		_zui_end_element();
 
 		if (config_raw.touch_ui) {
 			ui._x += 12 * zui_SCALE(ui);
@@ -349,7 +349,7 @@ function tab_layers_draw_layer_slot_full(l: slot_layer_t, i: i32) {
 		tab_layers_combo_object(ui, l);
 		ui._y += center;
 
-		zui_end_element();
+		_zui_end_element();
 	}
 
 	ui._y -= zui_ELEMENT_OFFSET(ui);
diff --git a/base/Assets/World_irradiance.arm b/base/Assets/World_irradiance.arm
index 0463d624fa861cbe66ae37ca9d421a7d2869064a..482f130c8ec78c6a35617e2fbbb6ed8db1b91c84 100644
GIT binary patch
delta 33
ncmb<vXOy_l$iTpGn+r%}78NC?WG3b%r{0xjV3^34$H)Kxn*s>>

delta 21
ccmZo?tl?{1m047jn39>8mz;V>dZI)g09vsKUH||9

diff --git a/base/Assets/shader_datas.arm b/base/Assets/shader_datas.arm
index 58c4f5d9c1813cd40fcfe1b52ea97390397e0190..2d2ff099d7246ebd623249b82c247c7cfe109ba2 100644
GIT binary patch
literal 27851
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

literal 17251
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

diff --git a/base/Sources/base.ts b/base/Sources/base.ts
index 76e83015..bd6ad8ea 100644
--- a/base/Sources/base.ts
+++ b/base/Sources/base.ts
@@ -237,9 +237,8 @@ function base_init() {
 
 	base_color_wheel = image_color_wheel;
 	base_color_wheel_gradient = image_color_wheel_gradient;
-	// zui_set_enum_texts(base_enum_texts);
 	zui_nodes_enum_texts = base_enum_texts;
-	zui_tr = tr;
+	// zui_tr = tr; ////
 	let ops: zui_options_t = {
 		theme: base_theme,
 		font: f.font_,
@@ -896,7 +895,7 @@ function base_enum_texts(node_type: string): string[] {
 	///if (is_paint || is_sculpt)
 	if (node_type == "TEX_IMAGE") {
 		if (project_asset_names.length > 0) {
-			project_asset_names;
+			return project_asset_names;
 		}
 		else {
 			let empty: string[] = [""];
diff --git a/base/Sources/box_export.ts b/base/Sources/box_export.ts
index a109caff..0b488a98 100644
--- a/base/Sources/box_export.ts
+++ b/base/Sources/box_export.ts
@@ -149,7 +149,7 @@ function box_export_tab_export_textures(ui: zui_t, title: string, bake_material:
 		let layers_destination_combo: string[] = [tr("Disk"), tr("Packed")];
 		context_raw.layers_destination = zui_combo(layers_destination_handle, layers_destination_combo, tr("Destination"), true);
 
-		zui_end_element();
+		_zui_end_element();
 
 		zui_row(row);
 		if (zui_button(tr("Cancel"))) {
diff --git a/base/Sources/box_preferences.ts b/base/Sources/box_preferences.ts
index a32912a0..36773d3b 100644
--- a/base/Sources/box_preferences.ts
+++ b/base/Sources/box_preferences.ts
@@ -127,7 +127,7 @@ function box_preferences_show() {
 			// zui_text("Node Editor");
 			// let grid_snap: bool = Zui.check(Zui.handle("boxpreferences_11", { selected: false }), "Grid Snap");
 
-			zui_end_element();
+			_zui_end_element();
 			let row: f32[] = [0.5, 0.5];
 			zui_row(row);
 			if (zui_button(tr("Restore")) && !ui_menu_show) {
@@ -264,10 +264,7 @@ function box_preferences_show() {
 					}
 				}, 11);
 			}
-			let val: i32 = h.color;
-			if (val < 0) {
-				val += 4294967296;
-			}
+			let val: u32 = h.color;
 			h.text = i32_to_string_hex(val);
 			zui_text_input(h, "VIEWPORT_COL");
 			h.color = parse_int_hex(h.text);
@@ -291,12 +288,8 @@ function box_preferences_show() {
 				let key: string = zui_theme_keys[i];
 
 				let h: zui_handle_t = zui_nest(hlist, i);
-				let val: i32 = 0; //// theme[key];
-
+				let val: u32 = 0; //// theme[key];
 				let is_hex: bool = ends_with(key, "_COL");
-				if (is_hex && val < 0) {
-					val += 4294967296;
-				}
 
 				if (is_hex) {
 					let row: f32[] = [1 / 8, 7 / 8];
@@ -579,7 +572,7 @@ function box_preferences_show() {
 			config_raw.pressure_angle = zui_check(h_pressure_angle, tr("Brush Angle"));
 			///end
 
-			zui_end_element();
+			_zui_end_element();
 			let row: f32[] = [0.5];
 			zui_row(row);
 			if (zui_button(tr("Help"))) {
diff --git a/base/Sources/box_projects.ts b/base/Sources/box_projects.ts
index d1f818eb..2af9da1c 100644
--- a/base/Sources/box_projects.ts
+++ b/base/Sources/box_projects.ts
@@ -91,9 +91,9 @@ function box_projects_tab(ui: zui_t) {
 				let imgw: i32 = math_floor(128 * zui_SCALE(ui));
 				let i: i32 = j + row * num;
 				if (i >= recent_projects.length) {
-					zui_end_element(imgw);
+					_zui_end_element(imgw);
 					if (show_asset_names) {
-						zui_end_element(0);
+						_zui_end_element(0);
 					}
 					continue;
 				}
@@ -171,9 +171,9 @@ function box_projects_tab(ui: zui_t) {
 					}
 				}
 				else {
-					zui_end_element(0);
+					_zui_end_element(0);
 					if (show_asset_names) {
-						zui_end_element(0);
+						_zui_end_element(0);
 					}
 					ui._x = uix;
 				}
@@ -229,7 +229,7 @@ function box_projects_recent_tab(ui: zui_t) {
 		}
 		ui.enabled = true;
 
-		zui_end_element();
+		_zui_end_element();
 		if (zui_button(tr("New .."), zui_align_t.LEFT)) {
 			project_new_box();
 		}
@@ -242,7 +242,7 @@ function box_projects_recent_tab(ui: zui_t) {
 function box_projects_draw_badge(ui: zui_t) {
 	let img: image_t = data_get_image("badge.k");
 	_zui_image(img);
-	zui_end_element();
+	_zui_end_element();
 }
 
 function box_projects_get_started_tab(ui: zui_t) {
diff --git a/base/Sources/export_arm.ts b/base/Sources/export_arm.ts
index 718e5942..bb7b42b4 100644
--- a/base/Sources/export_arm.ts
+++ b/base/Sources/export_arm.ts
@@ -270,21 +270,21 @@ function export_arm_export_node(n: zui_node_t, assets: asset_t[] = null) {
 		}
 	}
 	// Pack colors
-	if (n.color > 0) {
-		n.color -= 4294967296;
-	}
-	for (let i: i32 = 0; i < n.inputs.length; ++i) {
-		let inp: zui_node_socket_t = n.inputs[i];
-		if (inp.color > 0) {
-			inp.color -= 4294967296;
-		}
-	}
-	for (let i: i32 = 0; i < n.outputs.length; ++i) {
-		let out: zui_node_socket_t = n.outputs[i];
-		if (out.color > 0) {
-			out.color -= 4294967296;
-		}
-	}
+	// if (n.color > 0) {
+	// 	n.color -= 4294967296;
+	// }
+	// for (let i: i32 = 0; i < n.inputs.length; ++i) {
+	// 	let inp: zui_node_socket_t = n.inputs[i];
+	// 	if (inp.color > 0) {
+	// 		inp.color -= 4294967296;
+	// 	}
+	// }
+	// for (let i: i32 = 0; i < n.outputs.length; ++i) {
+	// 	let out: zui_node_socket_t = n.outputs[i];
+	// 	if (out.color > 0) {
+	// 		out.color -= 4294967296;
+	// 	}
+	// }
 }
 
 ///if (is_paint || is_sculpt)
diff --git a/base/Sources/import_arm.ts b/base/Sources/import_arm.ts
index dbc2b588..2598b8f3 100644
--- a/base/Sources/import_arm.ts
+++ b/base/Sources/import_arm.ts
@@ -289,9 +289,9 @@ function import_arm_run_project(path: string) {
 			l.paint_rough = ld.paint_rough;
 			l.paint_met = ld.paint_met;
 			l.paint_nor = ld.paint_nor;
-			l.paint_nor_blend = ld.paint_nor_blend != null ? ld.paint_nor_blend : true; // TODO: deprecated
+			l.paint_nor_blend = ld.paint_nor_blend;
 			l.paint_height = ld.paint_height;
-			l.paint_height_blend = ld.paint_height_blend != null ? ld.paint_height_blend : true; // TODO: deprecated
+			l.paint_height_blend = ld.paint_height_blend;
 			l.paint_emis = ld.paint_emis;
 			l.paint_subs = ld.paint_subs;
 			///end
diff --git a/base/Sources/import_obj.ts b/base/Sources/import_obj.ts
index 49eab005..abbc4238 100644
--- a/base/Sources/import_obj.ts
+++ b/base/Sources/import_obj.ts
@@ -66,7 +66,9 @@ function import_obj_run(path: string, replace_existing: bool = true) {
 			for (let i: i32 = 0; i < parts.length; ++i) {
 				let j: i32 = i + 1;
 				while (j < parts.length) {
-					if (parts[i].name == parts[j].name) {
+					let iname: string = parts[i].name;
+					let jname: string = parts[j].name;
+					if (iname == jname) {
 						posa0 = parts[i].posa;
 						posa1 = parts[j].posa;
 						nora0 = parts[i].nora;
diff --git a/base/Sources/nodes/float_node.ts b/base/Sources/nodes/float_node.ts
index 2d27bc67..c495f6e8 100644
--- a/base/Sources/nodes/float_node.ts
+++ b/base/Sources/nodes/float_node.ts
@@ -5,13 +5,13 @@ type float_node_t = {
 	image?: image_t;
 };
 
-function float_node_create(args: f32): float_node_t {
+function float_node_create(args: f32_array_t): float_node_t {
 	let n: float_node_t = {};
 	n.base = logic_node_create();
 	n.base.get = float_node_get;
 	n.base.get_as_image = float_node_get_as_image;
 	n.base.set = float_node_set;
-	n.value = args;
+	n.value = args[0];
 	return n;
 }
 
diff --git a/base/Sources/nodes/vector_node.ts b/base/Sources/nodes/vector_node.ts
index 0452ba56..3bd74488 100644
--- a/base/Sources/nodes/vector_node.ts
+++ b/base/Sources/nodes/vector_node.ts
@@ -14,9 +14,9 @@ function vector_node_create(args: f32_array_t): vector_node_t {
 	n.value = vec4_create();
 
 	if (args != null) {
-		logic_node_add_input(n.base, float_node_create(args[0]).base, 0);
-		logic_node_add_input(n.base, float_node_create(args[1]).base, 0);
-		logic_node_add_input(n.base, float_node_create(args[2]).base, 0);
+		logic_node_add_input(n.base, float_node_create(f32_array_create_x(args[0])).base, 0);
+		logic_node_add_input(n.base, float_node_create(f32_array_create_x(args[1])).base, 0);
+		logic_node_add_input(n.base, float_node_create(f32_array_create_x(args[2])).base, 0);
 	}
 
 	return n;
diff --git a/base/Sources/parser_logic.ts b/base/Sources/parser_logic.ts
index f91d1e09..2c764dd8 100644
--- a/base/Sources/parser_logic.ts
+++ b/base/Sources/parser_logic.ts
@@ -74,7 +74,9 @@ function parser_logic_safe_src(s: string): string {
 }
 
 function parser_logic_node_name(node: zui_node_t): string {
-	let s: string = parser_logic_safe_src(node.name) + node.id;
+	let safe: string = parser_logic_safe_src(node.name);
+	let nid: i32 = node.id;
+	let s: string = safe + nid;
 	return s;
 }
 
@@ -131,7 +133,9 @@ function parser_logic_build_node(node: zui_node_t): string {
 		// Is linked - find node
 		let l: zui_node_link_t = parser_logic_get_input_link(inp);
 		if (l != null) {
-			inp_node = map_get(parser_logic_node_map, parser_logic_build_node(parser_logic_get_node(l.from_id)));
+			let n: zui_node_t = parser_logic_get_node(l.from_id);
+			let s: string = parser_logic_build_node(n);
+			inp_node = map_get(parser_logic_node_map, s);
 			inp_from = l.from_socket;
 		}
 		// Not linked - create node with default values
diff --git a/base/Sources/project.ts b/base/Sources/project.ts
index 4125c916..ae0a4399 100644
--- a/base/Sources/project.ts
+++ b/base/Sources/project.ts
@@ -118,7 +118,7 @@ function project_new_box() {
 			let project_aspect_ratio_combo: string[] = ["1:1", "2:1", "1:2"];
 			context_raw.project_aspect_ratio = zui_combo(h_project_aspect_ratio, project_aspect_ratio_combo, tr("Aspect Ratio"), true);
 
-			zui_end_element();
+			_zui_end_element();
 			zui_row(row);
 			if (zui_button(tr("Cancel"))) {
 				ui_box_hide();
@@ -349,6 +349,17 @@ function project_import_material() {
 	});
 }
 
+function project_create_node_link(links: zui_node_link_t[], from_id: i32, from_socket: i32, to_id: i32, to_socket: i32): zui_node_link_t {
+	let link: zui_node_link_t = {
+		id: zui_next_link_id(links.buffer, links.length),
+		from_id: from_id,
+		from_socket: from_socket,
+		to_id: to_id,
+		to_socket: to_socket
+	};
+	return link;
+}
+
 function project_import_brush() {
 	let formats: string = string_array_join(path_texture_formats, ",");
 	ui_files_show("arm," + formats, false, true, function (path: string) {
@@ -374,13 +385,7 @@ function project_import_brush() {
 			n.y = 340;
 			n.buttons[0].default_value = f32_array_create_x(asset_index);
 			let links: zui_node_link_t[] = context_raw.brush.canvas.links;
-			let link: zui_node_link_t = {
-				id: zui_next_link_id(links.buffer, links.length),
-				from_id: n.id,
-				from_socket: 0,
-				to_id: 0,
-				to_socket: 4
-			};
+			let link: zui_node_link_t = project_create_node_link(links, n.id, 0, 0, 4);
 			array_push(links, link);
 
 			// Parse brush
diff --git a/base/Sources/tab_brushes.ts b/base/Sources/tab_brushes.ts
index afb307a9..4234ec51 100644
--- a/base/Sources/tab_brushes.ts
+++ b/base/Sources/tab_brushes.ts
@@ -45,8 +45,10 @@ function tab_brushes_draw(htab: zui_handle_t) {
 				let imgw: i32 = math_floor(50 * zui_SCALE(ui));
 				let i: i32 = j + row * num;
 				if (i >= project_brushes.length) {
-					zui_end_element(imgw);
-					if (config_raw.show_asset_names) zui_end_element(0);
+					_zui_end_element(imgw);
+					if (config_raw.show_asset_names) {
+						_zui_end_element(0);
+					}
 					continue;
 				}
 				let img: image_t = zui_SCALE(ui) > 1 ? project_brushes[i].image : project_brushes[i].image_icon;
diff --git a/base/Sources/tab_fonts.ts b/base/Sources/tab_fonts.ts
index ed0ab988..bb979e8b 100644
--- a/base/Sources/tab_fonts.ts
+++ b/base/Sources/tab_fonts.ts
@@ -53,9 +53,9 @@ function tab_fonts_draw(htab: zui_handle_t) {
 				let imgw: i32 = math_floor(50 * zui_SCALE(ui));
 				let i: i32 = j + row * num;
 				if (i >= project_fonts.length) {
-					zui_end_element(imgw);
+					_zui_end_element(imgw);
 					if (config_raw.show_asset_names) {
-						zui_end_element(0);
+						_zui_end_element(0);
 					}
 					continue;
 				}
diff --git a/base/Sources/tab_materials.ts b/base/Sources/tab_materials.ts
index a3856a27..ceb6820b 100644
--- a/base/Sources/tab_materials.ts
+++ b/base/Sources/tab_materials.ts
@@ -73,9 +73,9 @@ function tab_materials_draw_slots(mini: bool) {
 			let imgw: i32 = math_floor(50 * zui_SCALE(ui));
 			let i: i32 = j + row * num;
 			if (i >= project_materials.length) {
-				zui_end_element(imgw);
+				_zui_end_element(imgw);
 				if (config_raw.show_asset_names) {
-					zui_end_element(0);
+					_zui_end_element(0);
 				}
 				continue;
 			}
diff --git a/base/Sources/tab_swatches.ts b/base/Sources/tab_swatches.ts
index a5248259..21258c81 100644
--- a/base/Sources/tab_swatches.ts
+++ b/base/Sources/tab_swatches.ts
@@ -102,7 +102,7 @@ function tab_swatches_draw(htab: zui_handle_t) {
 			for (let j: i32 = 0; j < num; ++j) {
 				let i: i32 = j + row * num;
 				if (i >= project_raw.swatches.length) {
-					zui_end_element(slotw);
+					_zui_end_element(slotw);
 					continue;
 				}
 
@@ -207,10 +207,7 @@ function tab_swatches_draw(htab: zui_handle_t) {
 						else if (ui_menu_button(ui, tr("Copy Hex Code"))) {
 							let color: i32 = context_raw.swatch.base;
 							color = color_set_ab(color, context_raw.swatch.opacity * 255);
-							let val: i32 = color;
-							if (val < 0) {
-								val += 4294967296;
-							}
+							let val: u32 = color;
 							krom_copy_to_clipboard(i32_to_string(val));
 						}
 						///end
@@ -232,10 +229,7 @@ function tab_swatches_draw(htab: zui_handle_t) {
 				if (ui.is_hovered) {
 					let color: i32 = project_raw.swatches[i].base;
 					color = color_set_ab(color, project_raw.swatches[i].opacity * 255);
-					let val: i32 = color;
-					if (val < 0) {
-						val += 4294967296;
-					}
+					let val: u32 = color;
 					zui_tooltip("#" + i32_to_string_hex(val));
 				}
 			}
diff --git a/base/Sources/tab_textures.ts b/base/Sources/tab_textures.ts
index ba6a8d7e..0157344e 100644
--- a/base/Sources/tab_textures.ts
+++ b/base/Sources/tab_textures.ts
@@ -67,9 +67,9 @@ function tab_textures_draw(htab: zui_handle_t) {
 					let imgw: i32 = math_floor(50 * zui_SCALE(ui));
 					let i: i32 = j + row * num;
 					if (i >= project_assets.length) {
-						zui_end_element(imgw);
+						_zui_end_element(imgw);
 						if (config_raw.show_asset_names) {
-							zui_end_element(0);
+							_zui_end_element(0);
 						}
 						continue;
 					}
diff --git a/base/Sources/translator.ts b/base/Sources/translator.ts
index 341fd4d4..2886f7dd 100644
--- a/base/Sources/translator.ts
+++ b/base/Sources/translator.ts
@@ -157,7 +157,7 @@ function translator_init_font(cjk: bool, font_path: string, font_scale: f32) {
 
 		let f: g2_font_t = data_get_font(font_path);
 		if (cjk) {
-			let font_index: i32 = map_get(translator_cjk_font_indices, config_raw.locale) != null ? map_get(translator_cjk_font_indices, config_raw.locale) : 0;
+			let font_index: i32 = map_get(translator_cjk_font_indices, config_raw.locale) != -1 ? map_get(translator_cjk_font_indices, config_raw.locale) : 0;
 			g2_font_set_font_index(f, font_index);
 		}
 		base_font = f;
diff --git a/base/Sources/ui_box.ts b/base/Sources/ui_box.ts
index 021d0188..817394ff 100644
--- a/base/Sources/ui_box.ts
+++ b/base/Sources/ui_box.ts
@@ -79,10 +79,13 @@ function ui_box_render() {
 			if (zui_tab(zui_handle(__ID__), ui_box_title, tab_vertical)) {
 				let htext: zui_handle_t = zui_handle(__ID__);
 				htext.text = ui_box_text;
-				ui_box_copyable ?
-					zui_text_area(htext, zui_align_t.LEFT, false) :
+				if (ui_box_copyable) {
+					zui_text_area(htext, zui_align_t.LEFT, false);
+				}
+				else {
 					zui_text(ui_box_text);
-				zui_end_element();
+				}
+				_zui_end_element();
 
 				///if (krom_windows || krom_linux || krom_darwin)
 				if (ui_box_copyable) {
@@ -98,7 +101,7 @@ function ui_box_render() {
 				zui_row(row);
 				///end
 
-				zui_end_element();
+				_zui_end_element();
 
 				///if (krom_windows || krom_linux || krom_darwin)
 				if (ui_box_copyable && zui_button(tr("Copy"))) {
diff --git a/base/Sources/ui_files.ts b/base/Sources/ui_files.ts
index d3e4bd47..c668d2bd 100644
--- a/base/Sources/ui_files.ts
+++ b/base/Sources/ui_files.ts
@@ -152,8 +152,8 @@ function ui_files_file_browser(ui: zui_t, handle: zui_handle_t, folders_only: bo
 		for (let j: i32 = 0; j < num; ++j) {
 			let i: i32 = j + row * num;
 			if (i >= ui_files_files.length) {
-				zui_end_element(slotw);
-				zui_end_element(slotw);
+				_zui_end_element(slotw);
+				_zui_end_element(slotw);
 				continue;
 			}
 
diff --git a/base/Sources/ui_menu.ts b/base/Sources/ui_menu.ts
index 5b2d1084..e179e61a 100644
--- a/base/Sources/ui_menu.ts
+++ b/base/Sources/ui_menu.ts
@@ -593,7 +593,7 @@ function ui_menu_render() {
 
 						let img: image_t = data_get_image("badge.k");
 						_zui_image(img);
-						zui_end_element();
+						_zui_end_element();
 
 						let h: zui_handle_t = zui_handle(__ID__);
 						if (h.init) {
@@ -609,7 +609,7 @@ function ui_menu_render() {
 							krom_copy_to_clipboard(_ui_menu_render_msg);
 						}
 						///else
-						zui_end_element();
+						_zui_end_element();
 						///end
 
 						if (zui_button(tr("Contributors"))) {
@@ -713,7 +713,7 @@ function ui_menu_align(ui: zui_t) {
 	if (!config_raw.touch_ui) {
 		let row: f32[] = [12 / 100, 88 / 100];
 		zui_row(row);
-		zui_end_element();
+		_zui_end_element();
 	}
 }
 
diff --git a/base/Sources/ui_menubar.ts b/base/Sources/ui_menubar.ts
index f59d3367..ccf08fa3 100644
--- a/base/Sources/ui_menubar.ts
+++ b/base/Sources/ui_menubar.ts
@@ -200,11 +200,8 @@ function ui_menubar_show_menu(ui: zui_t, category: i32) {
 }
 
 function ui_menubar_icon_button(ui: zui_t, i: i32, j: i32): bool {
-	let col: i32 = ui.ops.theme.WINDOW_BG_COL;
-	if (col < 0) {
-		col += 4294967296;
-	}
-	let light: bool = col > (0xff666666 + 4294967296);
+	let col: u32 = ui.ops.theme.WINDOW_BG_COL;
+	let light: bool = col > 0xff666666 ;
 	let icon_accent: i32 = light ? 0xff666666 : 0xffaaaaaa;
 	let img: image_t = resource_get("icons.k");
 	let rect: rect_t = resource_tile50(img, i, j);
diff --git a/base/Sources/ui_nodes.ts b/base/Sources/ui_nodes.ts
index b910a77c..817e069f 100644
--- a/base/Sources/ui_nodes.ts
+++ b/base/Sources/ui_nodes.ts
@@ -943,7 +943,7 @@ function ui_nodes_render() {
 				}
 				if (!found) {
 					zui_remove_node(canvas_node, c);
-					array_remove(nodes.nodes_selected_id, canvas_node.id);
+					i32_array_remove(nodes.nodes_selected_id, canvas_node.id);
 					i--;
 				}
 			}
diff --git a/base/Sources/ui_toolbar.ts b/base/Sources/ui_toolbar.ts
index 57729c85..d4d2ae8f 100644
--- a/base/Sources/ui_toolbar.ts
+++ b/base/Sources/ui_toolbar.ts
@@ -84,11 +84,8 @@ function ui_toolbar_render_ui() {
 		ui.image_scroll_align = false;
 		let img: image_t = resource_get("icons.k");
 
-		let col: i32 = ui.ops.theme.WINDOW_BG_COL;
-		if (col < 0) {
-			col += 4294967296;
-		}
-		let light: bool = col > (0xff666666 + 4294967296);
+		let col: u32 = ui.ops.theme.WINDOW_BG_COL;
+		let light: bool = col > 0xff666666;
 		let icon_accent: i32 = light ? 0xff666666 : -1;
 
 		// Properties icon