Fix Finger issues with newer models

Author: Melioli

Tools/armature_utils.py

@@ -1180,3 +1180,29 @@ def ReparentBone(armature, bone_name, parent_name):
         bone.parent = parent_bone
     else:
         print(f"Could not find bone {bone_name} or parent bone {parent_name}")
+
+
+def MergeBones(armature, bone_to_merge, parent_bone):
+    """
+    Merges a bone into its parent by connecting the parent to the child's children
+    
+    Args:
+        armature: The armature object
+        bone_to_merge: Name of the bone to be merged
+        parent_bone: Name of the parent bone to merge into
+    """
+    if bone_to_merge not in armature.data.edit_bones or parent_bone not in armature.data.edit_bones:
+        return
+    
+    bone = armature.data.edit_bones[bone_to_merge]
+    parent = armature.data.edit_bones[parent_bone]
+    
+    # Store children of the bone to be merged
+    children = [child for child in bone.children]
+    
+    # Reparent all children to the parent bone
+    for child in children:
+        child.parent = parent
+    
+    # Remove the merged bone
+    armature.data.edit_bones.remove(bone)

Tools/convertWWPC.py

@@ -376,9 +376,52 @@ def MergeEyes():
 
             # Deselect all objects
             bpy.ops.object.select_all(action='DESELECT')
+
+        def FixFingers():
+            # Make sure armature is selected and active
+            bpy.context.view_layer.objects.active = armature
+            armature.select_set(True)
 
+            # Enter edit mode first
+            blender_utils.ChangeMode("EDIT")
+            print("\nStarting finger renaming process...")
 
-        
+            # Rename thumb bones
+            for side in ["L", "R"]:
+                thumb1 = armature.data.edit_bones.get(f"Thumb1_{side}")
+                thumb4 = armature.data.edit_bones.get(f"Thumb4_{side}")
+                if thumb1 and thumb4:
+                    print(f"Renaming {thumb1.name} to Thumb_{side}")
+                    thumb1.name = f"Thumb_{side}"
+                    # Rename remaining bones up the chain
+                    for i in range(2, 5):
+                        old_name = f"Thumb{i}_{side}"
+                        new_name = f"Thumb{i-1}_{side}"
+                        if bone := armature.data.edit_bones.get(old_name):
+                            print(f"Renaming {old_name} to {new_name}")
+                            bone.name = new_name
+            
+            # Rename finger bones
+            finger_types = ["Index", "Middle", "Ring", "Little"]
+            for finger in finger_types:
+                for side in ["L", "R"]:
+                    finger1 = armature.data.edit_bones.get(f"{finger}Finger1_{side}")
+                    finger4 = armature.data.edit_bones.get(f"{finger}Finger4_{side}")
+                    if finger1 and finger4:
+                        print(f"Renaming {finger1.name} to Bone_{side}")
+                        finger1.name = f"Bone_{side}"
+                        # Rename remaining bones up the chain
+                        for i in range(2, 5):
+                            old_name = f"{finger}Finger{i}_{side}"
+                            new_name = f"{finger}Finger{i-1}_{side}"
+                            if bone := armature.data.edit_bones.get(old_name):
+                                print(f"Renaming {old_name} to {new_name}")
+                                bone.name = new_name
+            
+            print("\nFinger renaming completed")
+            # Return to object mode
+            blender_utils.ChangeMode("OBJECT")
+
         def Run():
             armature_utils.RenameBones(game, armature)
             armature_utils.CleanBones()
@@ -392,6 +435,7 @@ def Run():
             CreateEyesBones("Left Eye", "Eye_L")
             CreateEyesBones("Right Eye", "Eye_R")
             MergeEyes()
+            FixFingers()
             blender_utils.ResetCursor()