- Bump Version Number

- Update shape data to match base model even when using default shape data.

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -121,6 +121,36 @@ public class TTMeshPart
 
         public Dictionary<string, TTShapePart> ShapeParts = new Dictionary<string, TTShapePart>();
 
+
+        /// <summary>
+        /// Updates all shapes in this part to any updated UV/Normal/etc. data from the base model.
+        /// </summary>
+        public void UpdateShapeData()
+        {
+            foreach(var shpKv in ShapeParts)
+            {
+                var shp = shpKv.Value;
+
+                foreach(var rKv in shp.VertexReplacements)
+                {
+                    var baseVert = Vertices[rKv.Key];
+                    var shapeVert = shp.Vertices[rKv.Value];
+
+                    shapeVert.Normal = baseVert.Normal;
+                    shapeVert.Tangent = baseVert.Tangent;
+                    shapeVert.Binormal = baseVert.Binormal;
+                    shapeVert.Handedness = baseVert.Handedness;
+                    shapeVert.UV1 = baseVert.UV1;
+                    shapeVert.UV2 = baseVert.UV2;
+
+                    Array.Copy(baseVert.VertexColor, shapeVert.VertexColor, 4);
+                    Array.Copy(baseVert.BoneIds, shapeVert.BoneIds, 4);
+                    Array.Copy(baseVert.Weights, shapeVert.Weights, 4);
+
+                }
+            }
+        }
+
     }
 
     /// <summary>
@@ -385,6 +415,17 @@ public int GetIndexAt(int id)
 
         }
 
+        /// <summary>
+        /// Updates all shapes in this mesh group to any updated UV/Normal/etc. data from the base model.
+        /// </summary>
+        public void UpdateShapeData()
+        {
+            foreach (var p in Parts)
+            {
+                p.UpdateShapeData();
+            }
+        }
+
         /// <summary>
         /// When stacked together, this is the list of points which the Triangle Index pointer would start for each part.
         /// </summary>
@@ -1945,6 +1986,18 @@ public static TTModel FromRaw(XivMdl rawMdl, Action<bool, string> loggingFunctio
             return ttModel;
         }
 
+
+        /// <summary>
+        /// Updates all shapes in this model to any updated UV/Normal/etc. data from the base model.
+        /// </summary>
+        public void UpdateShapeData()
+        {
+            foreach(var m in MeshGroups)
+            {
+                m.UpdateShapeData();
+            }
+        }
+
         #endregion
 
         #region  Internal Helper Functions

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -134,6 +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)