Merge branch 'main' into MergeBones

functions/additional_tools.py

@@ -5,7 +5,7 @@ from ..core.common import get_selected_armature, is_valid_armature, get_all_mesh
 from ..functions.translations import t
 
 @register_wrap
-class ApplyTransforms(Operator):
+class AvatarToolKit_OT_ApplyTransforms(Operator):
     bl_idname = "avatar_toolkit.apply_transforms"
     bl_label = t("Tools.apply_transforms.label")
     bl_description = t("Tools.apply_transforms.desc")

functions/atlas_materials.py

@@ -2,13 +2,11 @@ from pathlib import Path
 
 import numpy
 import bpy
-import re
 import os
 from typing import List, Tuple, Optional
-from mathutils import Vector
 from bpy.types import Material, Operator, Context, Object, Image, Mesh, MeshUVLoopLayer, Float2AttributeValue, ShaderNodeTexImage, ShaderNodeBsdfPrincipled, ShaderNodeNormalMap
 from ..core.register import register_wrap
-from ..core.common import SceneMatClass, material_list_bool
+from ..core.common import SceneMatClass, MaterialListBool
 from ..core.packer.rectangle_packer import MaterialImageList, BinPacker
 from ..functions.translations import t
 
@@ -113,7 +111,7 @@ def prep_images_in_scene(context: Context) -> list[MaterialImageList]:
 
 
 @register_wrap
-class Atlas_Materials(Operator):
+class AvatarToolKit_OT_AtlasMaterials(Operator):
 
     bl_idname = "avatar_toolkit.atlas_materials"
     bl_label = t("TextureAtlas.atlas_materials")

functions/combine_materials.py

@@ -53,7 +53,7 @@ def get_base_name(name: str) -> str:
     return mat_match.group(1) if mat_match else name
 
 @register_wrap
-class CombineMaterials(Operator):
+class AvatarToolKit_OT_CombineMaterials(Operator):
     bl_idname = "avatar_toolkit.combine_materials"
     bl_label = t("Optimization.combine_materials.label")
     bl_description = t("Optimization.combine_materials.desc")

functions/digitigrade_legs.py

@@ -6,8 +6,8 @@ import re
 
 
 @register_wrap
-class CreateDigitigradeLegs(bpy.types.Operator):
-    bl_idname = "avatar_toolkit.createdigitigradelegs"
+class AvatarToolKit_OT_CreateDigitigradeLegs(bpy.types.Operator):
+    bl_idname = "avatar_toolkit.create_digitigrade_legs"
     bl_label = t('Tools.create_digitigrade_legs.label')
     bl_description = t('Tools.create_digitigrade_legs.desc')
 

functions/import_anything.py

@@ -3,14 +3,13 @@ from bpy.types import Operator
 from bpy_extras.io_utils import ImportHelper
 from ..core.register import register_wrap
 from ..core.importer import imports, import_types
-from ..core.common import remove_default_objects
+from ..core.common import remove_default_objects, open_web_after_delay_multi_threaded
 from ..functions.translations import t
 import pathlib
 import os
-from ..core import common
 
 @register_wrap
-class ImportAnyModel(Operator, ImportHelper):
+class AvatarToolKit_OT_ImportAnyModel(Operator, ImportHelper):
     bl_idname = 'avatar_toolkit.import_any_model'
     bl_label = t('Tools.import_any_model.label')
     bl_description = t('Tools.import_any_model.desc')
@@ -24,7 +23,7 @@ class ImportAnyModel(Operator, ImportHelper):
     #since I wrote this myself, a bit more efficent than cats. mostly - @989onan
     def execute(self, context: bpy.types.Context):
         file_grouping_dict: dict[str, list[dict[str,str]]] = dict()#group our files so our importers can import them together. in the case of OBJ+MTL and others that need grouped files, this is extremely important.
-        common.remove_default_objects()
+        remove_default_objects()
         #check if we are importing multiple files
         is_multi = False
         try:
@@ -69,9 +68,9 @@ class ImportAnyModel(Operator, ImportHelper):
                 else:
                     import_types[file_group_name]("",files,self.filepath) #give an empty directory, works just fine for 90%
             except AttributeError as e:
-                print("Warning, you may not have the required importer!")
+                print("Warning, you may not have the required importer for extension type \"{extension}\"!".format(extension = file_group_name))
                 
-                common.open_web_after_delay_multi_threaded(delay=12, url=t('Importing.importer_search_term').format(extension = file_group_name))
+                open_web_after_delay_multi_threaded(delay=12, url=t('Importing.importer_search_term').format(extension = file_group_name))
 
                 self.report({'ERROR'},t('Importing.need_importer').format(extension = file_group_name))
 

functions/join_meshes.py

@@ -6,7 +6,7 @@ from ..core.common import fix_uv_coordinates, get_selected_armature, is_valid_ar
 from ..functions.translations import t
 
 @register_wrap
-class JoinAllMeshes(Operator):
+class AvatarToolKit_OT_JoinAllMeshes(Operator):
     bl_idname = "avatar_toolkit.join_all_meshes"
     bl_label = t("Optimization.join_all_meshes.label")
     bl_description = t("Optimization.join_all_meshes.desc")
@@ -72,7 +72,7 @@ class JoinAllMeshes(Operator):
         finish_progress(context)
 
 @register_wrap
-class JoinSelectedMeshes(Operator):
+class AvatarToolKit_OT_JoinSelectedMeshes(Operator):
     bl_idname = "avatar_toolkit.join_selected_meshes"
     bl_label = t("Optimization.join_selected_meshes.label")
     bl_description = t("Optimization.join_selected_meshes.desc")

functions/remove_doubles_safely.py

@@ -12,7 +12,7 @@ class meshEntry(TypedDict):
     cur_vertex_pass: int
 
 @register_wrap
-class RemoveDoublesSafelyAdvanced(Operator):
+class AvatarToolKit_OT_RemoveDoublesSafelyAdvanced(Operator):
     bl_idname = "avatar_toolkit.remove_doubles_safely_advanced"
     bl_label = t("Optimization.remove_doubles_safely_advanced.label")
     bl_description = t("Optimization.remove_doubles_safely_advanced.desc")
@@ -30,7 +30,7 @@ class RemoveDoublesSafelyAdvanced(Operator):
         bpy.ops.avatar_toolkit.remove_doubles_safely('INVOKE_DEFAULT',advanced=True,merge_distance=self.merge_distance)
         return {'FINISHED'}
 @register_wrap
-class RemoveDoublesSafely(Operator):
+class AvatarToolKit_OT_RemoveDoublesSafely(Operator):
     bl_idname = "avatar_toolkit.remove_doubles_safely"
     bl_label = t("Optimization.remove_doubles_safely.label")
     bl_description = t("Optimization.remove_doubles_safely.desc")

functions/resonite_functions.py

@@ -8,7 +8,7 @@ from ..core.common import get_selected_armature, simplify_bonename, is_valid_arm
 from ..functions.translations import t
 
 @register_wrap
-class ConvertToResonite(Operator):
+class AvatarToolKit_OT_ConvertToResonite(Operator):
     bl_idname = 'avatar_toolkit.convert_to_resonite'
     bl_label = t('Tools.convert_to_resonite.label')
     bl_description = t('Tools.convert_to_resonite.desc')

functions/seperate_by.py

@@ -1,11 +1,10 @@
 import bpy
 from bpy.types import Context, Operator
 from ..core.register import register_wrap
-from ..core.common import get_selected_armature, is_valid_armature, select_current_armature
 from ..functions.translations import t
 
 @register_wrap
-class SeparateByMaterials(Operator):
+class AvatarToolKit_OT_SeparateByMaterials(Operator):
     bl_idname = "avatar_toolkit.separate_by_materials"
     bl_label = t("Tools.separate_by_materials.label")
     bl_description = t("Tools.separate_by_materials.desc")
@@ -25,7 +24,7 @@ class SeparateByMaterials(Operator):
         return {'FINISHED'}
 
 @register_wrap
-class SeparateByLooseParts(Operator):
+class AvatarToolKit_OT_SeparateByLooseParts(Operator):
     bl_idname = "avatar_toolkit.separate_by_loose_parts"
     bl_label = t("Tools.separate_by_loose_parts.label")
     bl_description = t("Tools.separate_by_loose_parts.desc")

functions/viseme.py

@@ -6,7 +6,7 @@ from typing import List, Tuple
 from ..core.common import get_selected_armature, is_valid_armature, get_all_meshes, init_progress, update_progress, finish_progress
 
 @register_wrap
-class AutoVisemeButton(bpy.types.Operator):
+class AvatarToolKit_OT_AutoVisemeButton(bpy.types.Operator):
     bl_idname = 'avatar_toolkit.create_visemes'
     bl_label = t('AutoVisemeButton.label')
     bl_description = t('AutoVisemeButton.desc')