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

MaterialX: Fix group nodes. #32

Merged
Bogdan Nagirniak merged 3 commits from Vasyl-Pidhirskyi/blender:fix_group_nodes into matx-export-material 2023-09-22 18:37:41 +02:00
Conversation 0 Commits 3 Files Changed 1 +11 -5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 180e021b6c - Show all commits

16
source/blender/nodes/shader/materialx/group_nodes.cc
View File

@ -3,6 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "group_nodes.h" #include "group_nodes.h"
#include "node_item.h"
#include "node_parser.h" #include "node_parser.h"
#include "BLI_vector.hh" #include "BLI_vector.hh"
@ -31,10 +32,9 @@ NodeItem GroupNodeParser::compute()
graph = group_graph.get(); graph = group_graph.get();
#endif #endif
NodeItem out = NodeItem out = GroupOutputNodeParser(
GroupOutputNodeParser( graph, depsgraph_, material_, node_out, socket_out_, to_type_, this)
graph, depsgraph_, material_, node_out, socket_out_, NodeItem::Type::Any, this) .compute_full();
.compute_full();
#ifdef USE_MATERIALX_NODEGRAPH #ifdef USE_MATERIALX_NODEGRAPH
/* We have to be in NodeParser's graph_, therefore copying output */ /* We have to be in NodeParser's graph_, therefore copying output */
@ -73,7 +73,10 @@ NodeItem GroupOutputNodeParser::compute()
} }
return outputs[socket_out_->index()]; return outputs[socket_out_->index()];
#else #else
return get_input_value(socket_out_->index(), NodeItem::Type::Any); if (NodeItem::is_arithmetic(to_type_)) {
return get_input_value(socket_out_->index(), to_type_);
}
return get_input_link(socket_out_->index(), to_type_);
#endif #endif
} }
@ -115,6 +118,9 @@ NodeItem GroupInputNodeParser::compute()
} }
return create_input("input" + std::to_string(socket_out_->index() + 1), value); return create_input("input" + std::to_string(socket_out_->index() + 1), value);
#else #else
if (NodeItem::is_arithmetic(to_type_)) {
return group_parser_->get_input_value(socket_out_->index(), to_type_);
}
return group_parser_->get_input_link(socket_out_->index(), to_type_); return group_parser_->get_input_link(socket_out_->index(), to_type_);
#endif #endif
} }