- Fixed Shape Data being loaded with incorrect Bone IDs

- Fixed Roe F skin parent.

Author: Lunaretic

xivModdingFramework/General/Enums/XivRace.cs

@@ -510,6 +510,13 @@ public static XivRace GetSkinRace(this XivRace race)
                 return XivRace.Hyur_Midlander_Male;
             }
 
+            // Roe F is very weird and uses Highlander F's skin materials,
+            // but Midlander F's models.  Blame SE hard-coding shit.
+            if(node.Race == XivRace.Roegadyn_Female)
+            {
+                return XivRace.Hyur_Highlander_Female;
+            }
+
             if (node.HasSkin)
             {
                 return node.Race;

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -598,7 +598,8 @@ public static void MergeShapeData(TTModel ttModel, XivMdl ogMdl, Action<bool, st
                         var oldBoneSet = new List<string>();
                         for (int bi = 0; bi < oldBoneSetRaw.BoneIndexCount; bi++)
                         {
-                            oldBoneSet.Add(ogMdl.PathData.BoneList[bi]);
+                            var bbi = oldBoneSetRaw.BoneIndices[bi];
+                            oldBoneSet.Add(ogMdl.PathData.BoneList[bbi]);
                         }
 
                         // No shape data for groups that don't exist in the old model.