diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 9d4be3971e5ee2324fe5cd53630c39ae3f7e4cbd..87798cfdec5ad0992bf1f7b98a6ba866148d7125 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, 4, 11), + "version": (1, 4, 12), 'blender': (2, 90, 0), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/io/com/gltf2_io.py b/io_scene_gltf2/io/com/gltf2_io.py index 7d70b5fbe8b4de1e02a78555a9f2bc62c399aee7..86a29f5c5774f9ed22b91a4a9cdb6cc79d368720 100755 --- a/io_scene_gltf2/io/com/gltf2_io.py +++ b/io_scene_gltf2/io/com/gltf2_io.py @@ -1117,7 +1117,7 @@ class Texture: extras = obj.get("extras") name = from_union([from_str, from_none], obj.get("name")) sampler = from_union([from_int, from_none], obj.get("sampler")) - source = from_int(obj.get("source")) + source = from_union([from_int, from_none], obj.get("source")) return Texture(extensions, extras, name, sampler, source) def to_dict(self): @@ -1127,7 +1127,7 @@ class Texture: result["extras"] = from_extra(self.extras) result["name"] = from_union([from_str, from_none], self.name) result["sampler"] = from_union([from_int, from_none], self.sampler) - result["source"] = from_int(self.source) # most viewers can't handle missing sources + result["source"] = from_union([from_int, from_none], self.source) return result