From 6d2869503e6546f68759703f7c1d509e82bdc429 Mon Sep 17 00:00:00 2001 From: Rupert Rawnsley Date: Fri, 7 Jul 2023 17:10:48 +0100 Subject: [PATCH 1/3] Fix for gtlf exporter python library path changes --- addons/io_hubs_addon/io/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/io_hubs_addon/io/utils.py b/addons/io_hubs_addon/io/utils.py index b4d4b237..b1d81513 100644 --- a/addons/io_hubs_addon/io/utils.py +++ b/addons/io_hubs_addon/io/utils.py @@ -1,14 +1,14 @@ import os import bpy from io_scene_gltf2.blender.com import gltf2_blender_extras -from io_scene_gltf2.blender.exp import gltf2_blender_gather_materials, gltf2_blender_gather_nodes, gltf2_blender_gather_joints -from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture_info, gltf2_blender_export_keys +from io_scene_gltf2.blender.exp import gltf2_blender_gather_nodes, gltf2_blender_gather_joints +from io_scene_gltf2.blender.exp.material import gltf2_blender_gather_materials, gltf2_blender_gather_texture_info +from io_scene_gltf2.blender.exp.material.extensions import gltf2_blender_image from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached from io_scene_gltf2.io.com import gltf2_io_extensions from io_scene_gltf2.io.com import gltf2_io from io_scene_gltf2.io.exp import gltf2_io_binary_data from io_scene_gltf2.io.exp import gltf2_io_image_data -from io_scene_gltf2.blender.exp import gltf2_blender_image from typing import Optional, Tuple, Union from ..nodes.lightmap import MozLightmapNode @@ -76,7 +76,7 @@ def gather_image(blender_image, export_settings): if type(data) == tuple: data = data[0] - if export_settings[gltf2_blender_export_keys.FORMAT] == 'GLTF_SEPARATE': + if export_settings['gltf_format'] == 'GLTF_SEPARATE': uri = HubsImageData(data=data, mime_type=mime_type, name=name) buffer_view = None else: From de43def2e1bf2f457f71cea1f685156225c46f5d Mon Sep 17 00:00:00 2001 From: Rupert Rawnsley Date: Mon, 10 Jul 2023 19:17:02 +0100 Subject: [PATCH 2/3] Refactor to preserve compatibility with previous versions of Blender --- addons/io_hubs_addon/io/utils.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/addons/io_hubs_addon/io/utils.py b/addons/io_hubs_addon/io/utils.py index b1d81513..20a32162 100644 --- a/addons/io_hubs_addon/io/utils.py +++ b/addons/io_hubs_addon/io/utils.py @@ -1,9 +1,14 @@ import os import bpy from io_scene_gltf2.blender.com import gltf2_blender_extras -from io_scene_gltf2.blender.exp import gltf2_blender_gather_nodes, gltf2_blender_gather_joints -from io_scene_gltf2.blender.exp.material import gltf2_blender_gather_materials, gltf2_blender_gather_texture_info -from io_scene_gltf2.blender.exp.material.extensions import gltf2_blender_image +if bpy.app.version >= (3, 6, 0): + from io_scene_gltf2.blender.exp import gltf2_blender_gather_nodes, gltf2_blender_gather_joints + from io_scene_gltf2.blender.exp.material import gltf2_blender_gather_materials, gltf2_blender_gather_texture_info + from io_scene_gltf2.blender.exp.material.extensions import gltf2_blender_image +else: + from io_scene_gltf2.blender.exp import gltf2_blender_gather_materials, gltf2_blender_gather_nodes, gltf2_blender_gather_joints + from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture_info, gltf2_blender_export_keys + from io_scene_gltf2.blender.exp import gltf2_blender_image from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached from io_scene_gltf2.io.com import gltf2_io_extensions from io_scene_gltf2.io.com import gltf2_io @@ -12,6 +17,11 @@ from typing import Optional, Tuple, Union from ..nodes.lightmap import MozLightmapNode +if bpy.app.version >= (3, 6, 0): + gltf2_blender_export_keys_format = 'gltf_format' +else: + gltf2_blender_export_keys_format = gltf2_blender_export_keys.FORMAT + # gather_texture/image with HDR support via MOZ_texture_rgbe @@ -76,7 +86,7 @@ def gather_image(blender_image, export_settings): if type(data) == tuple: data = data[0] - if export_settings['gltf_format'] == 'GLTF_SEPARATE': + if export_settings[gltf2_blender_export_keys_format] == 'GLTF_SEPARATE': uri = HubsImageData(data=data, mime_type=mime_type, name=name) buffer_view = None else: From 9133e3c92420ed8c62f76b9fd6668ef68420ffc0 Mon Sep 17 00:00:00 2001 From: Rupert Rawnsley Date: Tue, 11 Jul 2023 07:56:55 +0100 Subject: [PATCH 3/3] Simplified export key change as it is already backwards compatible --- addons/io_hubs_addon/io/utils.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/io_hubs_addon/io/utils.py b/addons/io_hubs_addon/io/utils.py index 20a32162..12ba170e 100644 --- a/addons/io_hubs_addon/io/utils.py +++ b/addons/io_hubs_addon/io/utils.py @@ -17,11 +17,6 @@ from typing import Optional, Tuple, Union from ..nodes.lightmap import MozLightmapNode -if bpy.app.version >= (3, 6, 0): - gltf2_blender_export_keys_format = 'gltf_format' -else: - gltf2_blender_export_keys_format = gltf2_blender_export_keys.FORMAT - # gather_texture/image with HDR support via MOZ_texture_rgbe @@ -86,7 +81,7 @@ def gather_image(blender_image, export_settings): if type(data) == tuple: data = data[0] - if export_settings[gltf2_blender_export_keys_format] == 'GLTF_SEPARATE': + if export_settings['gltf_format'] == 'GLTF_SEPARATE': uri = HubsImageData(data=data, mime_type=mime_type, name=name) buffer_view = None else: