diff options
Diffstat (limited to 'io_scene_gltf2/blender')
3 files changed, 13 insertions, 13 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py index 7b9335cf..0dfce9f9 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py @@ -193,11 +193,11 @@ def __get_image_data(sockets, export_settings) -> ExportImage: # rudimentarily try follow the node tree to find the correct image data. src_chan = Channel.R for elem in result.path: - if isinstance(elem.from_node, bpy.types.ShaderNodeSeparateRGB): + if isinstance(elem.from_node, bpy.types.ShaderNodeSeparateColor): src_chan = { - 'R': Channel.R, - 'G': Channel.G, - 'B': Channel.B, + 'Red': Channel.R, + 'Green': Channel.G, + 'Blue': Channel.B, }[elem.from_socket.name] if elem.from_socket.name == 'Alpha': src_chan = Channel.A diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py b/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py index 73232f14..e34683f2 100644 --- a/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py @@ -39,10 +39,10 @@ def clearcoat(mh, location, clearcoat_socket): x -= 200 # Separate RGB - node = mh.node_tree.nodes.new('ShaderNodeSeparateRGB') + node = mh.node_tree.nodes.new('ShaderNodeSeparateColor') node.location = x - 150, y - 75 # Outputs - mh.node_tree.links.new(clearcoat_socket, node.outputs['R']) + mh.node_tree.links.new(clearcoat_socket, node.outputs['Red']) # Inputs clearcoat_socket = node.inputs[0] @@ -92,10 +92,10 @@ def clearcoat_roughness(mh, location, roughness_socket): x -= 200 # Separate RGB (roughness is in G) - node = mh.node_tree.nodes.new('ShaderNodeSeparateRGB') + node = mh.node_tree.nodes.new('ShaderNodeSeparateColor') node.location = x - 150, y - 75 # Outputs - mh.node_tree.links.new(roughness_socket, node.outputs['G']) + mh.node_tree.links.new(roughness_socket, node.outputs['Green']) # Inputs color_socket = node.inputs[0] diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py b/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py index a5d10a7a..4c32c35d 100755 --- a/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py @@ -363,11 +363,11 @@ def metallic_roughness(mh: MaterialHelper, location, metallic_socket, roughness_ x -= 200 # Separate RGB - node = mh.node_tree.nodes.new('ShaderNodeSeparateRGB') + node = mh.node_tree.nodes.new('ShaderNodeSeparateColor') node.location = x - 150, y - 75 # Outputs - mh.node_tree.links.new(metallic_socket, node.outputs['B']) - mh.node_tree.links.new(roughness_socket, node.outputs['G']) + mh.node_tree.links.new(metallic_socket, node.outputs['Blue']) + mh.node_tree.links.new(roughness_socket, node.outputs['Green']) # Inputs color_socket = node.inputs[0] @@ -447,10 +447,10 @@ def occlusion(mh: MaterialHelper, location, occlusion_socket): x -= 200 # Separate RGB - node = mh.node_tree.nodes.new('ShaderNodeSeparateRGB') + node = mh.node_tree.nodes.new('ShaderNodeSeparateColor') node.location = x - 150, y - 75 # Outputs - mh.node_tree.links.new(occlusion_socket, node.outputs['R']) + mh.node_tree.links.new(occlusion_socket, node.outputs['Red']) # Inputs color_socket = node.inputs[0] |