griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

glTF Exporter: AO color can now be used as BaseColor

Browse Source
This commit is contained in:
Julien Duroure
2025-05-02 15:20:14 +02:00
parent 99c87fbf18
commit dbb2b01ff9
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/addons_core/io_scene_gltf2/__init__.py
View File

@@ -5,7 +5,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": (4, 5, 17),
"version": (4, 5, 18),
'blender': (4, 4, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

35
scripts/addons_core/io_scene_gltf2/blender/exp/material/search_node_tree.py
View File

@@ -336,12 +336,30 @@ class NodeNav:
# Check for a constant in the next node
nav = self.peek_back()
if nav.moved:
# Dev warning: because of loopbacks, this can be an infinite loop if not careful
# Please check all branches of your if statements
while True:
if not nav.moved:
break
if self.in_socket.type == 'RGBA':
# RGB node
if nav.node.type == 'RGB':
color = list(nav.out_socket.default_value)
color = color[:3] # drop unused alpha component (assumes shader tree)
return color, "node_tree." + nav.out_socket.path_from_id() + ".default_value"
# Ambient Occlusion node, not linked
elif nav.node.type == 'AMBIENT_OCCLUSION' and not nav.node.inputs['Color'].is_linked:
color = list(nav.node.inputs['Color'].default_value)
color = color[:3] # drop unused alpha component (assumes shader tree)
return color, "node_tree." + nav.node.inputs['Color'].path_from_id() + ".default_value"
# Ambient Occlusion node, linked, so check the next node
elif nav.node.type == "AMBIENT_OCCLUSION" and nav.node.inputs['Color'].is_linked:
nav.move_back('Color')
continue
else:
break
elif self.in_socket.type == 'SHADER':
# Historicaly, we manage RGB node plugged into a shader socket (output node)
@@ -349,10 +367,25 @@ class NodeNav:
color = list(nav.out_socket.default_value)
color = color[:3]
return color, "node_tree." + nav.out_socket.path_from_id() + ".default_value"
# Ambient Occlusion node, not linked
elif nav.node.type == 'AMBIENT_OCCLUSION' and not nav.node.inputs['Color'].is_linked:
color = list(nav.node.inputs['Color'].default_value)
color = color[:3] # drop unused alpha component (assumes shader tree)
return color, "node_tree." + nav.node.inputs['Color'].path_from_id() + ".default_value"
# Ambient Occlusion node, linked, so check the next node
elif nav.node.type == "AMBIENT_OCCLUSION" and nav.node.inputs['Color'].is_linked:
nav.move_back('Color')
continue
else:
break
elif self.in_socket.type == 'VALUE':
if nav.node.type == 'VALUE':
return nav.out_socket.default_value, "node_tree." + nav.out_socket.path_from_id() + ".default_value"
else:
break
else:
break
return None, None