Fix skeleton changes not being detected when switching between hairst…

…yles with same amount of bones
Aether-Tools · Nov 26, 2024 · eaeb4cf · eaeb4cf
1 parent da7eb91
commit eaeb4cf
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/CustomizePlus/Armatures/Data/Armature.cs b/CustomizePlus/Armatures/Data/Armature.cs
@@ -172,12 +172,32 @@ public bool IsSkeletonUpdated(CharacterBase* cBase)
         {
             for (var i = 0; i < cBase->Skeleton->PartialSkeletonCount; ++i)
             {
+                if (i == 2)
+                    continue; //hair is handled separately
+
                 var newPose = cBase->Skeleton->PartialSkeletons[i].GetHavokPose(Constants.TruePoseIndex);
 
                 if (newPose != null
                     && newPose->Skeleton->Bones.Length != _partialSkeletons[i].Length)
                     return true;
-                //todo: compare bones for hair partial skeleton [2]
+            }
+
+            //handle hair separately because different hairstyles can have the same amount of bones.
+            if(cBase->Skeleton->PartialSkeletonCount > 2)
+            {
+                var newPose = cBase->Skeleton->PartialSkeletons[2].GetHavokPose(Constants.TruePoseIndex);
+
+                if(newPose != null)
+                {
+                    if(newPose->Skeleton->Bones.Length != _partialSkeletons[2].Length)
+                        return true;
+
+                    for(var i = 0; i < newPose->Skeleton->Bones.Length; i++)
+                    {
+                        if (newPose->Skeleton->Bones[i].Name.String != _partialSkeletons[2][i].BoneName)
+                            return true;
+                    }
+                }
             }
         }