Fix Blender 4.2 import/export errors (again).

Greatness7 · Nov 14, 2024 · 1ad530c · 1ad530c
1 parent 6d68341
commit 1ad530c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/__init__.py b/__init__.py
@@ -1,7 +1,7 @@
 bl_info = {
     "name": "Morrowind (.nif)",
     "author": "Greatness7",
-    "version": (0, 8, 101),
+    "version": (0, 8, 102),
     "blender": (3, 0, 0),
     "location": "File > Import/Export > Morrowind (.nif)",
     "description": "Import/Export files for Morrowind",

diff --git a/blender_manifest.toml b/blender_manifest.toml
@@ -1,7 +1,7 @@
 schema_version = "1.0.0"
 
 id = "io_scene_mw"
-version = "0.8.101"
+version = "0.8.102"
 name = "Morrowind Blender Plugin"
 tagline = "Import/Export files for Morrowind"
 maintainer = "Greatness7 <[email protected]>"

diff --git a/nif_export.py b/nif_export.py
@@ -322,9 +322,7 @@ def setup_markers(self, data):
 
     @property
     def scale_correction(self):
-        addon = bpy.context.preferences.addons[
-            "bl_ext.user_default.io_scene_mw" if bpy.app.version >= (4, 2, 0) else "io_scene_mw"
-        ]
+        addon = bpy.context.preferences.addons[__package__]
         return 1 / addon.preferences.scale_correction
 
     @property

diff --git a/nif_import.py b/nif_import.py
@@ -376,9 +376,7 @@ def import_keyframe_data(self, data):
 
     @property
     def scale_correction(self):
-        addon = bpy.context.preferences.addons[
-            "bl_ext.user_default.io_scene_mw" if bpy.app.version >= (4, 2, 0) else "io_scene_mw"
-        ]
+        addon = bpy.context.preferences.addons[__package__]
         return addon.preferences.scale_correction
 
 
@@ -1024,9 +1022,7 @@ def resolve_texture_path(
         suffixes = {path.suffix, ".dds", ".tga", ".bmp"}
 
         # evaluate final image path
-        addon = bpy.context.preferences.addons[
-            "bl_ext.user_default.io_scene_mw" if bpy.app.version >= (4, 2, 0) else "io_scene_mw"
-        ]
+        addon = bpy.context.preferences.addons[__package__]
         for item in addon.preferences.texture_paths:
             abspath = item.name / path
             for suffix in suffixes: