Update v2.3.4.13

Author: Lunaretic

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1730,9 +1730,16 @@ public async Task<List<string>> GetReferencedMaterialPaths(string mdlPath, int m
             else if(useCached && root != null)
             {
                 var metadata = await ItemMetadata.GetFromCachedIndex(root, index);
-                foreach (var entry in metadata.ImcEntries)
+                if (metadata.ImcEntries.Count == 0 || !Imc.UsesImc(root))
                 {
-                    materialVariants.Add(entry.MaterialSet);
+                    materialVariants.Add(1);
+                }
+                else
+                {
+                    foreach (var entry in metadata.ImcEntries)
+                    {
+                        materialVariants.Add(entry.MaterialSet);
+                    }
                 }
             }
             else
@@ -3071,6 +3078,10 @@ internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action
                                 var meshNum = p.MeshId;
                                 foreach (var r in p.IndexReplacements)
                                 {
+                                    if(r.Value > ushort.MaxValue)
+                                    {
+                                        throw new InvalidDataException("Mesh Group " + meshNum + " has too many total vertices/triangle indices.\nRemove some vertices/faces/shapes or split them across multiple mesh groups.");
+                                    }
                                     meshShapeDataBlock.AddRange(BitConverter.GetBytes((ushort)r.Key));
                                     meshShapeDataBlock.AddRange(BitConverter.GetBytes((ushort)r.Value));
                                 }

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -134,12 +134,9 @@ public void Apply(TTModel ttModel, XivMdl currentMdl = null, XivMdl originalMdl
                 }
                 ModelModifiers.ClearShapeData(ttModel, loggingFunction);
                 ModelModifiers.MergeShapeData(ttModel, originalMdl, loggingFunction);
-
-                // Let's at least update the base shape data to match our base model.
-                ttModel.UpdateShapeData();
             }
 
-            if(AutoScale)
+            if (AutoScale)
             {
                 if (originalMdl == null)
                 {
@@ -149,6 +146,9 @@ public void Apply(TTModel ttModel, XivMdl currentMdl = null, XivMdl originalMdl
                 var oldModel = TTModel.FromRaw(originalMdl);
                 ModelModifiers.AutoScaleModel(ttModel, oldModel, 0.3, loggingFunction);
             }
+
+            // Ensure shape data is updated with our various changes.
+            ttModel.UpdateShapeData();
         }
     }
 
@@ -1325,22 +1325,14 @@ public static void MakeImportReady(TTModel model, Action<bool, string> loggingFu
                     {
                         loggingFunction(true, "Group: " + mIdx + " Part: " + pIdx + " :: " + perPartMajorCorrections.ToString() + " Vertices had major corrections made to their weight data.");
                     }
-
-                    foreach(var shpKv in p.ShapeParts)
-                    {
-                        foreach(var v in shpKv.Value.Vertices)
-                        {
-                            v.UV1[1] *= -1;
-                            v.UV2[1] *= -1;
-                        }
-                    }
-
                     pIdx++;
                 }
                 mIdx++;
             }
 
 
+            // Update the base shape data to match our base model.
+            model.UpdateShapeData();
         }
 
         /// <summary>
@@ -1365,16 +1357,11 @@ public static void MakeExportReady(TTModel model, Action<bool, string> loggingFu
                         v.UV1[1] *= -1;
                         v.UV2[1] *= -1;
                     }
-                    foreach (var shpKv in p.ShapeParts)
-                    {
-                        foreach (var v in shpKv.Value.Vertices)
-                        {
-                            v.UV1[1] *= -1;
-                            v.UV2[1] *= -1;
-                        }
-                    }
                 }
             }
+
+            // Update the base shape data to match our base model.
+            model.UpdateShapeData();
         }
 
         /// <summary>