From a57002c0cb7929c41d1481f578700f7fd9eaf184 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Tue, 3 Mar 2020 22:56:27 +0100
Subject: [PATCH] Update iron

---
 Assets/creator/Scene.arm      | Bin 132488 -> 132920 bytes
 Assets/painter/Scene.arm      | Bin 132544 -> 132994 bytes
 Sources/arm/Project.hx        |   6 +++---
 Sources/arm/io/ImportMesh.hx  |  12 ++++++------
 Sources/arm/node/MakePaint.hx |   2 +-
 Sources/arm/util/MeshUtil.hx  |   6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Assets/creator/Scene.arm b/Assets/creator/Scene.arm
index 2d711a733103a6e5b65de48299396dd65207ab59..4fb78ab3df42b737c5a8382aafd8365a783eb668 100644
GIT binary patch
delta 313
zcmeC^=Gf84u_4%+k$G}LgZSiUyyBa)tcB!&T>m!l$s&9bo2Nty@{2PwFfiO^0}_cP
zB}JJ@w?X{m{G7>(0+O5eW-Jm%XrElxa0y9wLSqvnlH|`OWXZ?PD3Ud;$dYMooX9%c
z+Kmv#PQK8t2;^NjEIwIDK#0{SFTW^vGe<|E3c{+*6V_z$BXn#Q+OwA(L(8+nL5C1p
bw)?j+2H7L@Y~Oj5aicuCrtOVS8QB#8zvXDL

delta 267
zcmdnd$I;Qvu_4%+k!kwEc1H2d&DMf)5VkOLUVhQ$!;wP#Fn)4=&SsX(#o|!4ldm^i
zgh_#vUT<t>gh_QZqeykNAf#;DP^4_zx!}6WI}DKwoP51Q3C1l+t=O#5S*QXvfAh(;
xnQ&);>`vUfj~!X9-_f8$P_^4Hv@-_U!z6)<w+9?&+$0YZ0Ghnr@Hr#90sy-gTXg^c

diff --git a/Assets/painter/Scene.arm b/Assets/painter/Scene.arm
index 58d07bfb5dd6d1cb72e0a7687a910354ceedee2c..508e7a5541b95efcc608ebf9e5767e084babbc10 100644
GIT binary patch
delta 360
zcmX@m&C%4)vBAZfk$G}pgZSiUyyBaqt%c;kT;a(Vnpq}`@JVcLjTGdE2r(z;=S)@<
zkleg3W05#Q)8zDqOK5rm8=DxB6ufFeS8$~nML}*Wx`OaFPGl3x+l^4In0&BZ5h5~u
z!&63<$w~r3tVVhHMY)rIwkts-;LbJfs8B(;X7iynSx^tb{phl1FFRJ#HcK1{I)u=>
dy|Ilk$R45+rg{78ql_EnvFhHw`6(m20st*&d{O`a

delta 254
zcmZqb=Qz;KvBAZfk!kY(R`Jax)`D`3Oq1HhH*bv;<QHdRU|_h-1|$+oN{TX*ZZiX!
z$@w{(zh*2Jhv=AmqTwP$!^y@bMyObIGgPdm1umx71{Kq9=Y*-t=r9E9oqV!Gk&$V-
z?{h}+$x@w)IIYd<tW<$IRCrw`Kg8ZOd-t+KHE*7IH1H5a!FH(*#z1?pitV$HGj5cJ
QD%oE1oRLid<Ru^g0LS=ND*ylh

diff --git a/Sources/arm/Project.hx b/Sources/arm/Project.hx
index e1122400..21152db5 100644
--- a/Sources/arm/Project.hx
+++ b/Sources/arm/Project.hx
@@ -144,9 +144,9 @@ class Project {
 			var raw = {
 				name: "Tessellated",
 				vertex_arrays: [
-					{ values: mesh.posa, attrib: "pos" },
-					{ values: mesh.nora, attrib: "nor" },
-					{ values: mesh.texa, attrib: "tex" }
+					{ values: mesh.posa, attrib: "pos", data: "short4norm" },
+					{ values: mesh.nora, attrib: "nor", data: "short2norm" },
+					{ values: mesh.texa, attrib: "tex", data: "short2norm" }
 				],
 				index_arrays: [
 					{ values: mesh.inda, material: 0 }
diff --git a/Sources/arm/io/ImportMesh.hx b/Sources/arm/io/ImportMesh.hx
index 420a6280..b600bb3e 100644
--- a/Sources/arm/io/ImportMesh.hx
+++ b/Sources/arm/io/ImportMesh.hx
@@ -94,13 +94,13 @@ class ImportMesh {
 		var raw: TMeshData = null;
 		if (UITrait.inst.worktab.position == SpaceScene) {
 			raw = rawMesh(mesh);
-			if (mesh.texa != null) raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" });
+			if (mesh.texa != null) raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
 		}
 		else {
 			raw = rawMesh(mesh);
 			if (mesh.texa == null) equirectUnwrap(mesh);
-			raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" });
-			if (mesh.cola != null) raw.vertex_arrays.push({ values: mesh.cola, attrib: "col" });
+			raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
+			if (mesh.cola != null) raw.vertex_arrays.push({ values: mesh.cola, attrib: "col", data: "short4norm" });
 		}
 
 		new MeshData(raw, function(md: MeshData) {
@@ -175,7 +175,7 @@ class ImportMesh {
 			equirectUnwrap(mesh);
 		}
 		var raw = rawMesh(mesh);
-		raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex" });
+		raw.vertex_arrays.push({ values: mesh.texa, attrib: "tex", data: "short2norm" });
 
 		new MeshData(raw, function(md: MeshData) {
 
@@ -215,8 +215,8 @@ class ImportMesh {
 		return {
 			name: mesh.name,
 			vertex_arrays: [
-				{ values: mesh.posa, attrib: "pos" },
-				{ values: mesh.nora, attrib: "nor" }
+				{ values: mesh.posa, attrib: "pos", data: "short4norm" },
+				{ values: mesh.nora, attrib: "nor", data: "short2norm" }
 			],
 			index_arrays: [
 				{ values: mesh.inda, material: 0 }
diff --git a/Sources/arm/node/MakePaint.hx b/Sources/arm/node/MakePaint.hx
index a3cb3d57..a1d45dd9 100644
--- a/Sources/arm/node/MakePaint.hx
+++ b/Sources/arm/node/MakePaint.hx
@@ -25,7 +25,7 @@ class MakePaint {
 		con_paint.data.color_writes_green = [true, true, true, true];
 		con_paint.data.color_writes_blue = [true, true, true, true];
 		con_paint.data.color_writes_alpha = [true, true, true, true];
-		con_paint.allow_vcols = Context.paintObject.data.geom.cols != null;
+		con_paint.allow_vcols = Context.paintObject.data.geom.cols;
 
 		var vert = con_paint.make_vert();
 		var frag = con_paint.make_frag();
diff --git a/Sources/arm/util/MeshUtil.hx b/Sources/arm/util/MeshUtil.hx
index 5476854d..72504dac 100644
--- a/Sources/arm/util/MeshUtil.hx
+++ b/Sources/arm/util/MeshUtil.hx
@@ -52,9 +52,9 @@ class MeshUtil {
 		var raw: TMeshData = {
 			name: Context.paintObject.name,
 			vertex_arrays: [
-				{ values: va0, attrib: "pos" },
-				{ values: va1, attrib: "nor" },
-				{ values: va2, attrib: "tex" }
+				{ values: va0, attrib: "pos", data: "short4norm" },
+				{ values: va1, attrib: "nor", data: "short2norm" },
+				{ values: va2, attrib: "tex", data: "short2norm" }
 			],
 			index_arrays: [
 				{ values: ia, material: 0 }