[Bf-extensions-cvs] [4d2d118f] master: glTF importer: use relative path when possible

[Julien Duroure]

Commit: 4d2d118f9add7f634d6c2d7428f4c4d307c21368
Author: Julien Duroure
Date:   Thu Jan 20 18:37:59 2022 +0100
Branches: master
https://developer.blender.org/rBA4d2d118f9add7f634d6c2d7428f4c4d307c21368

glTF importer: use relative path when possible

===================================================================

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/imp/gltf2_blender_image.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index a31fad68..a7466592 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (1, 8, 8),
+    "version": (1, 8, 9),
     'blender': (3, 0, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_image.py b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
index 082e5665..3acf1786 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
@@ -43,49 +43,52 @@ class BlenderImage():
 
         num_images = len(bpy.data.images)
 
-        try:
-
-            if img.uri is not None and not img.uri.startswith('data:'):
-                # Image stored in a file
-                path = join(dirname(gltf.filename), _uri_to_path(img.uri))
-                img_name = img_name or basename(path)
-
+        if img.uri is not None and not img.uri.startswith('data:'):
+            # Image stored in a file
+            path = join(dirname(gltf.filename), _uri_to_path(img.uri))
+            path = os.path.abspath(path)
+            if bpy.data.is_saved and bpy.context.preferences.filepaths.use_relative_paths:
                 try:
-                    blender_image = bpy.data.images.load(
-                        os.path.abspath(path),
-                        check_existing=True,
-                    )
-                except RuntimeError:
-                    gltf.log.error("Missing image file (index %d): %s" % (img_idx, path))
-                    blender_image = _placeholder_image(img_name, os.path.abspath(path))
-                    is_placeholder = True
-
-            else:
-                # Image stored as data => create a tempfile, pack, and delete file
-                is_binary = True
-                img_data = BinaryData.get_image_data(gltf, img_idx)
-                if img_data is None:
-                    return
-                img_name = 'Image_%d' % img_idx
-
-                # Create image, width and height are dummy values
-                img_pack = bpy.data.images.new(img_name, 8, 8)
-                # Set packed file data
-                img_pack.pack(data=img_data.tobytes(), data_len=len(img_data))
-                img_pack.source = 'FILE'
-                img.blender_image_name = img_pack.name
-
-            if is_binary is False:
-                if len(bpy.data.images) != num_images:  # If created a new image
-                    blender_image.name = img_name
-                    img.blender_image_name = img_name
-
-                    needs_pack = gltf.import_settings['import_pack_images']
-                    if not is_placeholder and needs_pack:
-                        blender_image.pack()
-        except:
-            print("Unknown error loading texture")
-
+                    path = bpy.path.relpath(path)
+                except:
+                    # May happen on Windows if on different drives, eg. C:\ and D:\
+                    pass
+
+            img_name = img_name or basename(path)
+
+            try:
+                blender_image = bpy.data.images.load(
+                    path,
+                    check_existing=True,
+                )
+            except RuntimeError:
+                gltf.log.error("Missing image file (index %d): %s" % (img_idx, path))
+                blender_image = _placeholder_image(img_name, os.path.abspath(path))
+                is_placeholder = True
+
+        else:
+            # Image stored as data => pack
+            is_binary = True
+            img_data = BinaryData.get_image_data(gltf, img_idx)
+            if img_data is None:
+                return
+            img_name = 'Image_%d' % img_idx
+
+            # Create image, width and height are dummy values
+            img_pack = bpy.data.images.new(img_name, 8, 8)
+            # Set packed file data
+            img_pack.pack(data=img_data.tobytes(), data_len=len(img_data))
+            img_pack.source = 'FILE'
+            img.blender_image_name = img_pack.name
+
+        if is_binary is False:
+            if len(bpy.data.images) != num_images:  # If created a new image
+                blender_image.name = img_name
+                img.blender_image_name = img_name
+
+                needs_pack = gltf.import_settings['import_pack_images']
+                if not is_placeholder and needs_pack:
+                    blender_image.pack()
 
 def _placeholder_image(name, path):
     image = bpy.data.images.new(name, 128, 128)