Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duroure <julien.duroure@gmail.com>2019-09-05 23:12:53 +0300
committerJulien Duroure <julien.duroure@gmail.com>2019-09-05 23:12:53 +0300
commitd8e78e3cdcd2adba905b1729c859753df90a9632 (patch)
tree922ef0b35c02e6e4c3418cb8b2265cc4805142fb /io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
parent19819fb1ce7e3a3a603a32e6eac7f548cfbcf866 (diff)
glTF importer & exporter: fix texture transform after recent API change
Diffstat (limited to 'io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py')
-rwxr-xr-xio_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py33
1 files changed, 18 insertions, 15 deletions
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py b/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
index e60a557c..86eb4be4 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
@@ -130,11 +130,12 @@ class BlenderPbr():
mapping.vector_type = 'POINT'
if text_node.image is not None: # Sometimes images can't be retrieved (bad gltf file ...)
tex_transform = text_node.image['tex_transform'][str(pypbr.base_color_texture.index)]
- mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
- mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
- mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
- mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
- mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+ mapping.inputs['Location'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ mapping.inputs['Location'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ mapping.inputs['Rotation'].default_value[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ mapping.inputs['Scale'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ mapping.inputs['Scale'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+
uvmap = node_tree.nodes.new('ShaderNodeUVMap')
@@ -196,11 +197,12 @@ class BlenderPbr():
mapping.vector_type = 'POINT'
if text_node.image is not None: # Sometimes images can't be retrieved (bad gltf file ...)
tex_transform = text_node.image['tex_transform'][str(pypbr.base_color_texture.index)]
- mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
- mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
- mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
- mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
- mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+ mapping.inputs['Location'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ mapping.inputs['Location'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ mapping.inputs['Rotation'].default_value[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ mapping.inputs['Scale'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ mapping.inputs['Scale'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+
uvmap = node_tree.nodes.new('ShaderNodeUVMap')
if vertex_color:
@@ -251,11 +253,12 @@ class BlenderPbr():
metallic_mapping.location = -1000, 0
metallic_mapping.vector_type = 'POINT'
tex_transform = metallic_text.image['tex_transform'][str(pypbr.metallic_roughness_texture.index)]
- metallic_mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
- metallic_mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
- metallic_mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
- metallic_mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
- metallic_mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+ metallic_mapping.inputs['Location'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ metallic_mapping.inputs['Location'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ metallic_mapping.inputs['Rotation'].default_value[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ metallic_mapping.inputs['Scale'].default_value[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ metallic_mapping.inputs['Scale'].default_value[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+
metallic_uvmap = node_tree.nodes.new('ShaderNodeUVMap')
metallic_uvmap.location = -1500, 0