[BundleEditorPlugin] Fixes crash when adding duplicated chunks to bun…

…dles. [MeshSetPlugin] Adds DisplayName to FBX Export Window. [BundleEditorPlugin] Minor edits to match 1.0.6.3 [MeshSetPlugin] DisplayName to match 1.0.6.3
wavebend · Feb 1, 2025 · 0aa4524 · 0aa4524
1 parent eda390c
commit 0aa4524
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Plugins/BundleEditorPlugin/BundleEditor.cs b/Plugins/BundleEditorPlugin/BundleEditor.cs
@@ -44,7 +44,7 @@ public override void RemoveFromBundle(EbxAssetEntry entry, BundleEntry bentry)
                     if (lod.ChunkId != Guid.Empty)
                     {
                         ChunkAssetEntry chunkEntry = App.AssetManager.GetChunkEntry(lod.ChunkId);
-                        if (chunkEntry != null && chunkEntry.SuperBundles.Count == 0)
+                        if (chunkEntry != null && chunkEntry.SuperBundles.Count == 0 && chunkEntry.AddedSuperBundles.Count == 0)
                         {
                             chunkEntry.AddedBundles.Remove(App.AssetManager.GetBundleId(bentry));
                             resEntry.LinkAsset(chunkEntry);
@@ -232,7 +232,7 @@ public override void AddToBundle(EbxAssetEntry entry, BundleEntry bentry)
                     if (lod.ChunkId != Guid.Empty)
                     {
                         ChunkAssetEntry chunkEntry = App.AssetManager.GetChunkEntry(lod.ChunkId);
-                        if (chunkEntry != null && chunkEntry.SuperBundles.Count == 0)
+                        if (chunkEntry != null && chunkEntry.SuperBundles.Count == 0 && chunkEntry.AddedSuperBundles.Count == 0)
                         {
                             chunkEntry.AddToBundle(App.AssetManager.GetBundleId(bentry));
                             resEntry.LinkAsset(chunkEntry);
@@ -314,9 +314,9 @@ public override void AddToBundle(EbxAssetEntry entry, BundleEntry bentry)
         }
     }
 
-    public class TextureExtension : AddToBundleExtension
+    public class TextureBaseExtension : AddToBundleExtension
     {
-        public override string AssetType => "TextureAsset";
+        public override string AssetType => "TextureBaseAsset";
         public override void AddToBundle(EbxAssetEntry entry, BundleEntry bentry)
         {
             base.AddToBundle(entry, bentry);
@@ -338,9 +338,9 @@ public override void AddToBundle(EbxAssetEntry entry, BundleEntry bentry)
         }
     }
 
-    public class MovieTexture2Extension : AddToBundleExtension
+    public class MovieTextureExtension : AddToBundleExtension
     {
-        public override string AssetType => "MovieTexture2Asset";
+        public override string AssetType => "MovieTextureBaseAsset";
         public override void AddToBundle(EbxAssetEntry entry, BundleEntry bentry)
         {
             base.AddToBundle(entry, bentry);

diff --git a/Plugins/MeshSetPlugin/MeshAssetDefinition.cs b/Plugins/MeshSetPlugin/MeshAssetDefinition.cs
@@ -39,10 +39,13 @@ public class MeshExportSettings
 
         public MeshExportScale Scale { get; set; }
 
+        [DisplayName("Flatten Hierarchy (Blender)")]
         public bool FlattenHierarchy { get; set; }
 
+        [DisplayName("Export Single LOD")]
         public bool ExportSingleLod { get; set; }
 
+        [DisplayName("Export Additional Meshes")]
         public bool ExportAdditionalMeshes { get; set; }
     }