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

MaterialX: Implement export of Input nodes #20

Merged
Bogdan Nagirniak merged 26 commits from Vasyl-Pidhirskyi/blender:BLEN-530 into matx-export-material 2023-09-15 19:55:37 +02:00
Conversation 0 Commits 26 Files Changed 20 +15 -15
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0f1b574cb - Show all commits

6
source/blender/nodes/shader/materialx/node_parser.cc
View File

@ -33,10 +33,7 @@ NodeItem NodeParser::compute_full()
/* Checking if node was already computed */ /* Checking if node was already computed */
res.node = graph_->getNode(node_name()); res.node = graph_->getNode(node_name());
if (res.node) { if (!res.node) {
return res.convert(to_type_);
}
CLOG_INFO(LOG_MATERIALX_SHADER, CLOG_INFO(LOG_MATERIALX_SHADER,
1, 1,
"%s [%d] => %s", "%s [%d] => %s",
@ -48,6 +45,7 @@ NodeItem NodeParser::compute_full()
if (res.node) { if (res.node) {
res.node->setName(node_name()); res.node->setName(node_name());
} }
}
if (NodeItem::is_arithmetic(to_type_)) { if (NodeItem::is_arithmetic(to_type_)) {
res = res.convert(to_type_); res = res.convert(to_type_);
} }

3
source/blender/nodes/shader/nodes/node_shader_rgb.cc
View File

@ -29,8 +29,9 @@ static int gpu_shader_rgb(GPUMaterial *mat,
NODE_SHADER_MATERIALX_BEGIN NODE_SHADER_MATERIALX_BEGIN
#ifdef WITH_MATERIALX #ifdef WITH_MATERIALX
{ {
NodeItem color = get_output_default("Color", NodeItem::Type::Color4);
NodeItem res = create_node("constant", NodeItem::Type::Color4); NodeItem res = create_node("constant", NodeItem::Type::Color4);
res.set_input("value", get_output_default("Color", NodeItem::Type::Color4)); res.set_input("value", color);
return res; return res;
} }
#endif #endif

3
source/blender/nodes/shader/nodes/node_shader_value.cc
View File

@ -41,8 +41,9 @@ static void sh_node_value_build_multi_function(NodeMultiFunctionBuilder &builder
NODE_SHADER_MATERIALX_BEGIN NODE_SHADER_MATERIALX_BEGIN
#ifdef WITH_MATERIALX #ifdef WITH_MATERIALX
{ {
NodeItem value = get_output_default("Value", NodeItem::Type::Float);
NodeItem res = create_node("constant", NodeItem::Type::Float); NodeItem res = create_node("constant", NodeItem::Type::Float);
res.set_input("value", get_output_default("Value", NodeItem::Type::Float)); res.set_input("value", value);
return res; return res;
} }
#endif #endif