From 0938ef5681c044a0359d0a99768c8ea8b95955d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Norgeot?= Date: Wed, 13 Jan 2021 09:57:19 +0100 Subject: [PATCH 1/4] [#D3D-5979] Fixes alpha sorting on import --- .../io_sketchfab_plugin/blender/imp/gltf2_blender_material.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/io_sketchfab_plugin/blender/imp/gltf2_blender_material.py b/addons/io_sketchfab_plugin/blender/imp/gltf2_blender_material.py index 4fd4fe0..cb94889 100644 --- a/addons/io_sketchfab_plugin/blender/imp/gltf2_blender_material.py +++ b/addons/io_sketchfab_plugin/blender/imp/gltf2_blender_material.py @@ -45,6 +45,8 @@ def create(gltf, material_idx, vertex_color): if bpy.app.version >= (2, 80, 0): mat.use_backface_culling = (pymaterial.double_sided != True) + # Use multiple layers for transparency + mat.show_transparent_back = False if pymaterial.extensions is not None and 'KHR_materials_pbrSpecularGlossiness' in pymaterial.extensions.keys(): BlenderKHR_materials_pbrSpecularGlossiness.create(gltf, pymaterial.extensions['KHR_materials_pbrSpecularGlossiness'], mat.name, vertex_color) From 8adf114c34d01ac77da0a3f0c6892a7f3102357b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Norgeot?= Date: Wed, 13 Jan 2021 09:58:16 +0100 Subject: [PATCH 2/4] [#D3D-5979] Fixes "export selected" with hidden collections --- addons/io_sketchfab_plugin/pack_for_export.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/io_sketchfab_plugin/pack_for_export.py b/addons/io_sketchfab_plugin/pack_for_export.py index 027353d..140275f 100644 --- a/addons/io_sketchfab_plugin/pack_for_export.py +++ b/addons/io_sketchfab_plugin/pack_for_export.py @@ -71,7 +71,10 @@ def prepare_assets(export_settings): images.add(n.image) if export_settings['selection'] and ob.type == 'MESH': - if not Version.get_selected(ob) or not Version.get_visible(ob): + # Add relevant objects to the list of objects to remove + if not Version.get_visible(ob): # Not visible + hidden.add(ob) + elif not Version.get_selected(ob): # Visible but not selected Version.set_visible(ob, False) hidden.add(ob) From d2d14d7f5cbf96b2ee89dcf9ff946e09f79fbd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Norgeot?= Date: Mon, 18 Jan 2021 11:30:40 +0100 Subject: [PATCH 3/4] [#D3D-5979] Supports utf8 decoding for .gltf --- khronos-gltf.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/khronos-gltf.patch b/khronos-gltf.patch index 439ff2a..7f3a767 100644 --- a/khronos-gltf.patch +++ b/khronos-gltf.patch @@ -91,5 +91,13 @@ index 16a4242..02fd847 100644 + self.log = log.logger self.log_handler = log.hdlr - +@@ -159,7 +163,7 @@ class glTFImporter(): + # glTF file + if not self.is_glb_format: + self.content = None +- with open(self.filename, 'r') as f: ++ with open(self.filename, 'r', encoding='utf8') as f: + content = f.read() + try: + self.data = gltf_from_dict(json.loads(content, parse_constant=glTFImporter.bad_json_value)) From b12c92a3118e4f26d85717ade6212053a1c94978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Norgeot?= Date: Mon, 18 Jan 2021 12:37:24 +0100 Subject: [PATCH 4/4] [#D3D-5979] Bumps version to 1.3.1 --- addons/io_sketchfab_plugin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/io_sketchfab_plugin/__init__.py b/addons/io_sketchfab_plugin/__init__.py index eb634f6..a02b1fd 100644 --- a/addons/io_sketchfab_plugin/__init__.py +++ b/addons/io_sketchfab_plugin/__init__.py @@ -76,7 +76,7 @@ 'author': 'Sketchfab', 'license': 'GPL', 'deps': '', - 'version': (1, 3, 0), + 'version': (1, 3, 1), "blender": (2, 80, 0), 'location': 'View3D > Tools > Sketchfab', 'warning': '',