Fix importing packed assets

armory3d · Aug 20, 2023 · 6700e8a · 6700e8a
1 parent 8134415
commit 6700e8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/base/Sources/arm/io/ExportArm.hx b/base/Sources/arm/io/ExportArm.hx
@@ -26,7 +26,6 @@ class ExportArm {
 	}
 
 	public static function runProject() {
-
 		#if (is_paint || is_sculpt)
 		var mnodes: Array<TNodeCanvas> = [];
 		for (m in Project.materials) {
@@ -108,7 +107,7 @@ class ExportArm {
 		}
 		#end
 
-		var packed_assets = Project.raw.packed_assets == null || Project.raw.packed_assets.length == 0 ? null : Project.raw.packed_assets;
+		var packed_assets = (Project.raw.packed_assets == null || Project.raw.packed_assets.length == 0) ? null : Project.raw.packed_assets;
 		#if krom_ios
 		var sameDrive = false;
 		#else

diff --git a/base/Sources/arm/io/ImportArm.hx b/base/Sources/arm/io/ImportArm.hx
@@ -442,6 +442,7 @@ class ImportArm {
 			// Convert image path from relative to absolute
 			var abs = Data.isAbsolute(file) ? file : base + file;
 			if (project.packed_assets != null) {
+				abs = Path.normalize(abs);
 				unpackAsset(project, abs, file);
 			}
 			if (Data.cachedImages.get(abs) == null && !File.exists(abs)) {
@@ -527,6 +528,7 @@ class ImportArm {
 			// Convert image path from relative to absolute
 			var abs = Data.isAbsolute(file) ? file : base + file;
 			if (project.packed_assets != null) {
+				abs = Path.normalize(abs);
 				unpackAsset(project, abs, file);
 			}
 			if (Data.cachedImages.get(abs) == null && !File.exists(abs)) {