Merge pull request #9 from Andrej730/main

importing dds without image editor opened
matyalatte · May 16, 2023 · a78871f · a78871f
2 parents 6511573 + 5a82b6a
commit a78871f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/addons/blender_dds_addon/ui/bpy_util.py b/addons/blender_dds_addon/ui/bpy_util.py
@@ -19,10 +19,8 @@ def get_addon_preferences(context, addon_name):
 def get_image_editor_space(context):
     area = context.area
     if area.type == 'IMAGE_EDITOR':
-        space = area.spaces.active
-    else:
-        raise RuntimeError('Failed to get Image Editor. This is unexpected.')
-    return space
+        return area.spaces.active
+    return None
 
 
 def get_selected_tex(context):

diff --git a/addons/blender_dds_addon/ui/import_dds.py b/addons/blender_dds_addon/ui/import_dds.py
@@ -124,7 +124,8 @@ def import_dds(context, file):
     dds_options = context.scene.dds_options
     tex = load_dds(file, invert_normals=dds_options.invert_normals,
                    cubemap_layout=dds_options.cubemap_layout)
-    space.image = tex
+    if space:
+        space.image = tex
 
 
 def import_dds_rec(context, folder, count=0):