Merge pull request #147 from Yusarina/Current-Dev

Move simpify_bonename to dictionaries

core/common.py

@@ -383,11 +383,6 @@ def clear_unused_data_blocks() -> int:
                       if isinstance(getattr(bpy.data, attr), bpy.types.bpy_prop_collection))
     return initial_count - final_count
 
-def simplify_bonename(name: str) -> str:
-    """Simplify bone name by removing spaces, underscores, dots and converting to lowercase"""
-    return name.lower().translate(dict.fromkeys(map(ord, u" _.")))
-
-
 def identify_bones(arm_data: bpy.types.Armature, context: bpy.types.Context) -> Dict[str,str]:
     """Identify bone names in an armature based on our reverse dictionary, so there is no confusion to what a bone is.
     Essentially makes a dictionary of keys from dictionaries.bone_names like "hips", and the corosponding value is the bone that can be mapped to that key."""

core/dictionaries.py

@@ -5,7 +5,9 @@
 # Note2: Remove all "_", ".", and " " (space) from your values array or it will also not ever find a match!!!!
 # Taken from Tuxedo/Cats
 
-from .common import simplify_bonename
+def simplify_bonename(name: str) -> str:
+    """Simplify bone name by removing spaces, underscores, dots and converting to lowercase"""
+    return name.lower().translate(dict.fromkeys(map(ord, u" _.")))
 
 bone_names = {
     # Right side bones
@@ -260,7 +262,7 @@ bone_names.update({
     'hips': bone_names['hips'] + ['jbipchips', 'jhips', 'vrmhips'],
     'spine': bone_names['spine'] + ['jbipcspine', 'jspine', 'vrmspine'],
     'chest': bone_names['chest'] + ['jbipcchest', 'jchest', 'vrmchest'],
-    'upper_chest': bone_names['upperchest'] + ['jbipcupperchest', 'jupperchest', 'vrmupperchest'],
+    'upper_chest': bone_names['upper_chest'] + ['jbipcupperchest', 'jupperchest', 'vrmupperchest'],
     'neck': bone_names['neck'] + ['jbipcneck', 'jneck', 'vrmneck'],
     'head': bone_names['head'] + ['jbipchead', 'jhead', 'vrmhead'],
     
@@ -949,8 +951,8 @@ for category, mappings in non_standard_mappings.items():
 
 
 # Since data set is very poisoned by bone names that aren't simplified (And as such will not map properly using the function) we will just force convert them to the proper format at the end here. - @989onan
-for standard, mappings in bone_names:
-    for i in len(mappings):
+for standard, mappings in bone_names.items():
+    for i in range(len(mappings)):
         bone_names[standard][i] = simplify_bonename(mappings[i])
 
 # Create reverse lookup dictionary (conversion/translation)