[Bf-extensions-cvs] [cf2bb9e1] master: glTF importer: remove workaround now that T69857 is fixed

Julien Duroure noreply at git.blender.org
Tue Sep 17 22:22:52 CEST 2019


Commit: cf2bb9e1256441c6148be79273da6f2116e63018
Author: Julien Duroure
Date:   Tue Sep 17 22:22:08 2019 +0200
Branches: master
https://developer.blender.org/rBAcf2bb9e1256441c6148be79273da6f2116e63018

glTF importer: remove workaround now that T69857 is fixed

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

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 48b49ed5..0b7474e7 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, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (0, 9, 68),
+    "version": (0, 9, 69),
     'blender': (2, 81, 6),
     '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 95824537..546aa7e3 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
@@ -79,7 +79,6 @@ class BlenderImage():
                         return
 
                 blender_image = bpy.data.images.load(path)
-                blender_image.reload() # workaround bug in 2.81 alpha
                 blender_image.name = img_name
                 blender_image['tex_transform'] = {}
                 blender_image['tex_transform'][str(tex_index)] = tex_transform
@@ -104,7 +103,6 @@ class BlenderImage():
                 tmp_image.close()
 
                 blender_image = bpy.data.images.load(tmp_image.name)
-                blender_image.reload() # workaround bug in 2.81 alpha
                 blender_image.pack()
                 blender_image.name = img_name
                 blender_image['tex_transform'] = {}



More information about the Bf-extensions-cvs mailing list