DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

Support group nodes #22

Merged
Bogdan Nagirniak merged 18 commits from BogdanNagirniak/blender:matx-group-nodes into matx-export-material 2023-09-18 12:49:19 +02:00
Conversation 0 Commits 18 Files Changed 13 +8 -8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6662ecbd3 - Show all commits

8
source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
View File

@ -64,17 +64,17 @@ NODE_SHADER_MATERIALX_BEGIN
dielectric.set_input("scatter_mode", val(std::string("RT"))); dielectric.set_input("scatter_mode", val(std::string("RT")));
NodeItem artistic_ior = create_node("artistic_ior", NodeItem::Type::Multioutput); NodeItem artistic_ior = create_node("artistic_ior", NodeItem::Type::Multioutput);
artistic_ior.add_output("ior", NodeItem::Type::Color3);
artistic_ior.add_output("extinction", NodeItem::Type::Color3);
artistic_ior.set_input("reflectivity", color); artistic_ior.set_input("reflectivity", color);
artistic_ior.set_input("edge_color", color); artistic_ior.set_input("edge_color", color);
NodeItem ior_out = artistic_ior.add_output("ior", NodeItem::Type::Color3);
NodeItem extinction_out = artistic_ior.add_output("extinction", NodeItem::Type::Color3);
NodeItem conductor = create_node("conductor_bsdf", NodeItem::Type::BSDF); NodeItem conductor = create_node("conductor_bsdf", NodeItem::Type::BSDF);
if (normal) { if (normal) {
conductor.set_input("normal", normal); conductor.set_input("normal", normal);
} }
conductor.set_input_output("ior", artistic_ior, "ior"); conductor.set_input("ior", ior_out);
conductor.set_input_output("extinction", artistic_ior, "extinction"); conductor.set_input("extinction", extinction_out);
conductor.set_input("roughness", roughness); conductor.set_input("roughness", roughness);
NodeItem res = create_node("mix", NodeItem::Type::BSDF); NodeItem res = create_node("mix", NodeItem::Type::BSDF);

8
source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
View File

@ -70,10 +70,10 @@ NODE_SHADER_MATERIALX_BEGIN
NodeItem tangent = get_input_link("Tangent", NodeItem::Type::Vector3); NodeItem tangent = get_input_link("Tangent", NodeItem::Type::Vector3);
NodeItem artistic_ior = create_node("artistic_ior", NodeItem::Type::Multioutput); NodeItem artistic_ior = create_node("artistic_ior", NodeItem::Type::Multioutput);
artistic_ior.add_output("ior", NodeItem::Type::Color3);
artistic_ior.add_output("extinction", NodeItem::Type::Color3);
artistic_ior.set_input("reflectivity", color); artistic_ior.set_input("reflectivity", color);
artistic_ior.set_input("edge_color", color); artistic_ior.set_input("edge_color", color);
NodeItem ior_out = artistic_ior.add_output("ior", NodeItem::Type::Color3);
NodeItem extinction_out = artistic_ior.add_output("extinction", NodeItem::Type::Color3);
NodeItem res = create_node("conductor_bsdf", NodeItem::Type::BSDF); NodeItem res = create_node("conductor_bsdf", NodeItem::Type::BSDF);
if (normal) { if (normal) {
@ -82,8 +82,8 @@ NODE_SHADER_MATERIALX_BEGIN
if (tangent) { if (tangent) {
res.set_input("tangent", tangent); res.set_input("tangent", tangent);
} }
res.set_input_output("ior", artistic_ior, "ior"); res.set_input("ior", ior_out);
res.set_input_output("extinction", artistic_ior, "extinction"); res.set_input("extinction", extinction_out);
res.set_input("roughness", roughness); res.set_input("roughness", roughness);
return res; return res;