Merge branch 'Current' into Alpha-3

core/common.py

@@ -16,9 +16,10 @@ from bpy.types import (Context, Object, Modifier, EditBone, Operator, Material,
 from functools import lru_cache
 from bpy.props import PointerProperty, IntProperty, StringProperty
 from bpy.utils import register_class
-from .logging_setup import logger
-from .translations import t
-from .dictionaries import reverse_bone_lookup, simplify_bonename
+from ..core.logging_setup import logger
+from ..core.translations import t
+from ..core.dictionaries import bone_names
+from .dictionaries import reverse_bone_lookup, bone_names, simplify_bonename
 
 class SceneMatClass(PropertyGroup):
     mat: PointerProperty(type=Material)

core/importers/importer.py

@@ -18,7 +18,7 @@ logger: logging.Logger = logging.getLogger(__name__)
 import importlib.util
 
 if importlib.util.find_spec("io_scene_valvesource") is not None:
-    from io_scene_valvesource.import_smd import SmdImporter
+    from io_scene_valvesource.import_smd import SmdImporter # type: ignore
 
 class ImportProgress:
     """Tracks and logs the progress of multi-file imports"""

core/logging_setup.py

@@ -33,7 +33,7 @@ def configure_logging(enabled: bool = False, level: str = "WARNING") -> None:
         logger.addHandler(handler)
         
         def error_with_traceback(msg, *args, **kwargs):
-            if kwargs.get('exc_info', False) or isinstance(msg, Exception):
+            if isinstance(kwargs.get('exception', None), Exception):
                 full_msg = f"{msg}\n{traceback.format_exc()}"
                 _original_error(full_msg, *args, **{**kwargs, 'exc_info': False})
             else:

core/resonite_utils.py

@@ -1,3 +1,4 @@
+import traceback
 from types import FrameType
 import bpy
 import bpy_extras