maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix node group handling

Browse source
This commit is contained in:
Moritz Brückner 2020-10-09 19:24:55 +02:00
parent c6258894f1
commit 23b9016f13
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
blender/arm/material/cycles.py
View file

@ -292,13 +292,17 @@ def parse_vector_input(inp: bpy.types.NodeSocket) -> vec3str:
def parse_vector(node: bpy.types.Node, socket: bpy.types.NodeSocket) -> str:
"""Parses the vector/color output value from the given node and socket."""
if node.type == 'GROUP':
return parse_group(node, socket)
elif node.type == 'GROUP_INPUT':
return parse_group_input(node, socket)
# Use switch-like lookup via dictionary
# (better performance, better code readability)
# 'NODE_TYPE': parser_function
node_parser_funcs: Dict[str, Callable] = {
'ATTRIBUTE': nodes_input.parse_attribute,
'GROUP': parse_group,
'GROUP_INPUT': parse_group_input,
# RGB outputs
'RGB': nodes_input.parse_rgb,
@ -354,7 +358,7 @@ def parse_vector(node: bpy.types.Node, socket: bpy.types.NodeSocket) -> str:
if node.bl_idname == 'ArmShaderDataNode':
return node.parse(state.frag, state.vert)
else:
elif node.type not in ('GROUP', 'GROUP_INPUT'):
log.warn(f'Material node type {node.type} not supported')
return "vec3(0, 0, 0)"
@ -468,7 +472,7 @@ def parse_value(node, socket):
if node.bl_idname == 'ArmShaderDataNode':
return node.parse(state.frag, state.vert)
else:
elif node.type not in ('GROUP', 'GROUP_INPUT'):
log.warn(f'Material node type {node.type} not supported')
return '0.0'