[Bf-extensions-cvs] [d7d2bad0] master: glTF exporter: ignore muted node when checking tree
Julien Duroure
noreply at git.blender.org
Thu Sep 17 15:23:13 CEST 2020
Commit: d7d2bad09f8c04d3e86081481fc700ae3c834800
Author: Julien Duroure
Date: Wed Sep 16 17:55:40 2020 +0200
Branches: master
https://developer.blender.org/rBAd7d2bad09f8c04d3e86081481fc700ae3c834800
glTF exporter: ignore muted node when checking tree
===================================================================
M io_scene_gltf2/__init__.py
M io_scene_gltf2/blender/exp/gltf2_blender_get.py
===================================================================
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index d9173ea9..e3ae183f 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, 22),
+ "version": (1, 4, 23),
'blender': (2, 90, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_get.py b/io_scene_gltf2/blender/exp/gltf2_blender_get.py
index 27f4ae18..71eb4a2c 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_get.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_get.py
@@ -59,7 +59,7 @@ def get_socket(blender_material: bpy.types.Material, name: str):
# because the newer one is always present in all Principled BSDF materials.
type = bpy.types.ShaderNodeEmission
name = "Color"
- nodes = [n for n in blender_material.node_tree.nodes if isinstance(n, type)]
+ nodes = [n for n in blender_material.node_tree.nodes if isinstance(n, type) and not n.mute]
inputs = sum([[input for input in node.inputs if input.name == name] for node in nodes], [])
if inputs:
return inputs[0]
@@ -71,7 +71,7 @@ def get_socket(blender_material: bpy.types.Material, name: str):
name = "Color"
else:
type = bpy.types.ShaderNodeBsdfPrincipled
- nodes = [n for n in blender_material.node_tree.nodes if isinstance(n, type)]
+ nodes = [n for n in blender_material.node_tree.nodes if isinstance(n, type) and not n.mute]
inputs = sum([[input for input in node.inputs if input.name == name] for node in nodes], [])
if inputs:
return inputs[0]
More information about the Bf-extensions-cvs
mailing list