Merge branch 'main' of https://github.com/WolvenKit/Wolvenkit-Resources

WolvenKit · May 26, 2024 · 479e680 · 479e680
2 parents 3173b9b + c2dee3d
commit 479e680
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Scripts/Export_Ent.wscript b/Scripts/Export_Ent.wscript
@@ -106,7 +106,7 @@ function convertEmbedded(embeddedFile) {
     let jsonString = TypeHelper.JsonStringify(data);
 
     let cr2w = wkit.JsonToCR2W(jsonString);
-    wkit.SaveToProject(embeddedFile["FileName"], cr2w);
+    wkit.SaveToProject(embeddedFile["FileName"].value, cr2w);
 }
 
 // Parse a CR2W file
@@ -125,7 +125,7 @@ function ParseFile(fileName, parentFile) {
     if (extension !== 'unknown') {
         if (parentFile != null && parentFile["Data"]["EmbeddedFiles"].length > 0) {
             for (let embeddedFile of parentFile["Data"]["EmbeddedFiles"]) {
-                if (embeddedFile["FileName"] === fileName) {
+                if (embeddedFile["FileName"].value === fileName) {
                     convertEmbedded(embeddedFile);
 
                     if (jsonExtensions.includes(extension)) {

diff --git a/Scripts/Export_Ent_w_Rig.wscript b/Scripts/Export_Ent_w_Rig.wscript
@@ -168,7 +168,7 @@ function convertEmbedded(embeddedFile) {
     let jsonString = TypeHelper.JsonStringify(data);
 
     let cr2w = wkit.JsonToCR2W(jsonString);
-    wkit.SaveToProject(embeddedFile["FileName"], cr2w);
+    wkit.SaveToProject(embeddedFile["FileName"].value, cr2w);
 }
 
 // Parse a CR2W file
@@ -191,7 +191,7 @@ function ParseFile(fileName, parentFile) {
 
         if (parentFile != null && parentFile["Data"]["EmbeddedFiles"].length > 0) {
             for (let embeddedFile of parentFile["Data"]["EmbeddedFiles"]) {
-                if (embeddedFile["FileName"] === fileName) {
+                if (embeddedFile["FileName"].value === fileName) {
                     convertEmbedded(embeddedFile);
 
                     if (jsonExtensions.includes(extension)) {

diff --git a/Scripts/Export_Mesh.wscript b/Scripts/Export_Mesh.wscript
@@ -94,7 +94,7 @@ function convertEmbedded(embeddedFile) {
     let jsonString = TypeHelper.JsonStringify(data);
 
     let cr2w = wkit.JsonToCR2W(jsonString);
-    wkit.SaveToProject(embeddedFile["FileName"], cr2w);
+    wkit.SaveToProject(embeddedFile["FileName"].value, cr2w);
 }
 
 // Parse a CR2W file
@@ -113,7 +113,7 @@ function ParseFile(fileName, parentFile) {
     if (extension !== 'unknown') {
         const embeddedFiles = parentFile?.Data?.EmbeddedFiles || [];
         for (let embeddedFile of embeddedFiles) {
-            if (embeddedFile["FileName"] === fileName) {
+            if (embeddedFile["FileName"].value === fileName) {
                 convertEmbedded(embeddedFile);
 
                 if (jsonExtensions.includes(extension)) {
@@ -174,4 +174,4 @@ function ParseFile(fileName, parentFile) {
     }
 }
 
-//#endregion
+//#endregion
diff --git a/Scripts/Export_Vehicle_Ent.wscript b/Scripts/Export_Vehicle_Ent.wscript
@@ -129,7 +129,7 @@ function convertEmbedded(embeddedFile) {
     let jsonString = TypeHelper.JsonStringify(data);
 
     let cr2w = wkit.JsonToCR2W(jsonString);
-    wkit.SaveToProject(embeddedFile["FileName"], cr2w);
+    wkit.SaveToProject(embeddedFile["FileName"].value, cr2w);
 }
 
 // Parse a CR2W file
@@ -152,7 +152,7 @@ function ParseFile(fileName, parentFile) {
 
         if (parentFile != null && parentFile["Data"]["EmbeddedFiles"].length > 0) {
             for (let embeddedFile of parentFile["Data"]["EmbeddedFiles"]) {
-                if (embeddedFile["FileName"] === fileName) {
+                if (embeddedFile["FileName"].value === fileName) {
                     convertEmbedded(embeddedFile);
 
                     if (jsonExtensions.includes(extension)) {