blender
/
blender-addons
17
34
Fork 93
Code Issues 526 Pull Requests 33 Projects 1 Releases Wiki Activity

glTF importer: use relative path when possible

This commit is contained in:
Julien Duroure 2022-01-20 18:37:59 +01:00
parent 38be61ebb8
commit 4d2d118f9a
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_gltf2/__init__.py
View File

@ -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',

77
io_scene_gltf2/blender/imp/gltf2_blender_image.py
View File

@ -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
path = bpy.path.relpath(path)
except:
# May happen on Windows if on different drives, eg. C:\ and D:\
pass
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
img_name = img_name or basename(path)
# 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
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
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
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
needs_pack = gltf.import_settings['import_pack_images']
if not is_placeholder and needs_pack:
blender_image.pack()
except:
print("Unknown error loading texture")
# 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)