From 2b1ae8a203fb691d536c4e6c0951383ab2fa73d8 Mon Sep 17 00:00:00 2001
From: Lubos Lenco <lubos.lenco@gmail.com>
Date: Mon, 8 Jun 2020 10:56:04 +0200
Subject: [PATCH] Fix saving slot names

---
 Sources/arm/ProjectFormat.hx     | 1 +
 Sources/arm/data/BrushSlot.hx    | 3 +--
 Sources/arm/data/MaterialSlot.hx | 3 +--
 Sources/arm/io/ExportArm.hx      | 1 +
 Sources/arm/io/ImportArm.hx      | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Sources/arm/ProjectFormat.hx b/Sources/arm/ProjectFormat.hx
index 83fcebda..e1e1029f 100644
--- a/Sources/arm/ProjectFormat.hx
+++ b/Sources/arm/ProjectFormat.hx
@@ -17,6 +17,7 @@ typedef TProjectFormat = {
 }
 
 typedef TLayerData = {
+	public var name: String;
 	public var res: Int; // Width pixels
 	public var bpp: Int; // Bits per pixel
 	public var texpaint: haxe.io.Bytes;
diff --git a/Sources/arm/data/BrushSlot.hx b/Sources/arm/data/BrushSlot.hx
index 4fb6f3cc..b0a1b0bb 100644
--- a/Sources/arm/data/BrushSlot.hx
+++ b/Sources/arm/data/BrushSlot.hx
@@ -25,11 +25,10 @@ class BrushSlot {
 				});
 			}
 			canvas = Json.parse(defaultCanvas);
+			canvas.name = "Brush " + (id + 1);
 		}
 		else {
 			canvas = c;
 		}
-
-		canvas.name = "Brush " + (id + 1);
 	}
 }
diff --git a/Sources/arm/data/MaterialSlot.hx b/Sources/arm/data/MaterialSlot.hx
index 9a11d8dd..e2483376 100644
--- a/Sources/arm/data/MaterialSlot.hx
+++ b/Sources/arm/data/MaterialSlot.hx
@@ -44,12 +44,11 @@ class MaterialSlot {
 				});
 			}
 			canvas = Json.parse(defaultCanvas);
+			canvas.name = "Material " + (id + 1);
 		}
 		else {
 			canvas = c;
 		}
-
-		canvas.name = "Material " + (id + 1);
 	}
 
 	public function unload() {
diff --git a/Sources/arm/io/ExportArm.hx b/Sources/arm/io/ExportArm.hx
index 294548e5..b4595f84 100644
--- a/Sources/arm/io/ExportArm.hx
+++ b/Sources/arm/io/ExportArm.hx
@@ -46,6 +46,7 @@ class ExportArm {
 		var ld: Array<TLayerData> = [];
 		for (l in Project.layers) {
 			ld.push({
+				name: l.name,
 				res: l.texpaint != null ? l.texpaint.width : Project.layers[0].texpaint.width,
 				bpp: bpp,
 				texpaint: l.texpaint != null ? Lz4.encode(l.texpaint.getPixels()) : null,
diff --git a/Sources/arm/io/ImportArm.hx b/Sources/arm/io/ImportArm.hx
index 098356c3..6e8c1525 100644
--- a/Sources/arm/io/ImportArm.hx
+++ b/Sources/arm/io/ImportArm.hx
@@ -191,6 +191,7 @@ class ImportArm {
 				var ld = project.layer_datas[i];
 				var isGroup = ld.texpaint == null;
 				var l = new LayerSlot("", isGroup);
+				if (ld.name != null) l.name = ld.name;
 				Project.layers.push(l);
 
 				if (!isGroup) {