merge upstream

This commit is contained in:
2025-06-30 21:02:24 +00:00
2 changed files with 15 additions and 1 deletions

View File

@ -215,19 +215,27 @@ def parse_shader(node: bpy.types.Node, socket: bpy.types.NodeSocket) -> Tuple[st
'MIX_SHADER', 'MIX_SHADER',
'ADD_SHADER', 'ADD_SHADER',
'BSDF_PRINCIPLED', 'BSDF_PRINCIPLED',
'PRINCIPLED_BSDF',
'BSDF_DIFFUSE', 'BSDF_DIFFUSE',
'DIFFUSE_BSDF', 'DIFFUSE_BSDF',
'BSDF_GLOSSY', 'BSDF_GLOSSY',
'GLOSSY_BSDF',
'BSDF_SHEEN', 'BSDF_SHEEN',
'SHEEN_BSDF',
'AMBIENT_OCCLUSION', 'AMBIENT_OCCLUSION',
'BSDF_ANISOTROPIC', 'BSDF_ANISOTROPIC',
'ANISOTROPIC_BSDF',
'EMISSION', 'EMISSION',
'BSDF_GLASS', 'BSDF_GLASS',
'GLASS_BSDF',
'HOLDOUT', 'HOLDOUT',
'SUBSURFACE_SCATTERING', 'SUBSURFACE_SCATTERING',
'BSDF_TRANSLUCENT', 'BSDF_TRANSLUCENT',
'TRANSLUCENT_BSDF',
'BSDF_TRANSPARENT', 'BSDF_TRANSPARENT',
'TRANSPARENT_BSDF',
'BSDF_VELVET', 'BSDF_VELVET',
'VELVET_BSDF',
) )
state.reset_outs() state.reset_outs()

View File

@ -152,13 +152,19 @@ ALL_NODES: dict[str, MaterialNodeMeta] = {
'ADD_SHADER': MaterialNodeMeta(parse_func=nodes_shader.parse_addshader), 'ADD_SHADER': MaterialNodeMeta(parse_func=nodes_shader.parse_addshader),
'AMBIENT_OCCLUSION': MaterialNodeMeta(parse_func=nodes_shader.parse_ambientocclusion), 'AMBIENT_OCCLUSION': MaterialNodeMeta(parse_func=nodes_shader.parse_ambientocclusion),
'BSDF_ANISOTROPIC': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfanisotropic), 'BSDF_ANISOTROPIC': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfanisotropic),
'ANISOTROPI_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfanisotropic),
'BSDF_DIFFUSE': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfdiffuse), 'BSDF_DIFFUSE': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfdiffuse),
'DIFFUSE_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfdiffuse), 'DIFFUSE_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfdiffuse),
'BSDF_GLASS': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfglass), 'BSDF_GLASS': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfglass),
'GLASS_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfglass),
'BSDF_PRINCIPLED': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfprincipled), 'BSDF_PRINCIPLED': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfprincipled),
'PRINCIPLED_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfprincipled),
'BSDF_TRANSLUCENT': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftranslucent), 'BSDF_TRANSLUCENT': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftranslucent),
'TRANSLUCENT_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftranslucent),
'BSDF_TRANSPARENT': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftransparent), 'BSDF_TRANSPARENT': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftransparent),
'TRANSPARENT_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdftransparent),
'BSDF_REFRACTION': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfrefraction), 'BSDF_REFRACTION': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfrefraction),
'REFRACTION_BSDF': MaterialNodeMeta(parse_func=nodes_shader.parse_bsdfrefraction),
'EMISSION': MaterialNodeMeta(parse_func=nodes_shader.parse_emission), 'EMISSION': MaterialNodeMeta(parse_func=nodes_shader.parse_emission),
'HOLDOUT': MaterialNodeMeta( 'HOLDOUT': MaterialNodeMeta(
parse_func=nodes_shader.parse_holdout, parse_func=nodes_shader.parse_holdout,