griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #114229: Hydra MaterialX crash when node name starts with digit

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/114471
This commit is contained in:
Bogdan Nagirniak
2023-11-06 18:11:38 +01:00
committed by Brecht Van Lommel
parent 4f52ab0b49
commit 10848b9774
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/shader/CMakeLists.txt
View File

@@ -139,6 +139,10 @@ set(LIB
if(WITH_MATERIALX)
add_definitions(-DWITH_MATERIALX)
list(APPEND INC
${USD_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
)
list(APPEND SRC
materialx/material.cc
materialx/node_item.cc

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

@@ -2,6 +2,8 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include <pxr/base/tf/stringUtils.h>
#include "node_parser.h"
#include "group_nodes.h"
@@ -58,26 +60,40 @@ NodeItem NodeParser::compute_full()
return res;
}
std::string NodeParser::node_name() const
std::string NodeParser::node_name(bool with_out_socket) const
{
auto valid_name = [](const std::string &name) {
/* Node name should suite to MatX and USD valid names.
* It shouldn't start from '_', due to error occured in Storm delegate. */
std::string res = MaterialX::createValidName(pxr::TfMakeValidIdentifier(name));
if (res[0] == '_') {
res = "node" + res;
}
return res;
};
std::string name = node_->name;
if (node_->output_sockets().size() > 1) {
name += std::string("_") + socket_out_->name;
}
if (ELEM(to_type_, NodeItem::Type::BSDF, NodeItem::Type::EDF, NodeItem::Type::SurfaceOpacity)) {
name += "_" + NodeItem::type(to_type_);
if (with_out_socket) {
if (node_->output_sockets().size() > 1) {
name += std::string("_") + socket_out_->name;
}
if (ELEM(to_type_, NodeItem::Type::BSDF, NodeItem::Type::EDF, NodeItem::Type::SurfaceOpacity))
{
name += "_" + NodeItem::type(to_type_);
}
}
#ifdef USE_MATERIALX_NODEGRAPH
return MaterialX::createValidName(name);
return valid_name(name);
#else
std::string prefix;
GroupNodeParser *gr = group_parser_;
while (gr) {
const bNodeTree *ngroup = reinterpret_cast<const bNodeTree *>(gr->node_->id);
prefix = MaterialX::createValidName(ngroup->id.name) + "_" + prefix;
prefix = valid_name(ngroup->id.name) + "_" + prefix;
gr = gr->group_parser_;
}
return prefix + MaterialX::createValidName(name);
return prefix + valid_name(name);
#endif
}

2
source/blender/nodes/shader/materialx/node_parser.h
View File

@@ -50,7 +50,7 @@ class NodeParser {
virtual NodeItem compute_full();
protected:
std::string node_name() const;
std::string node_name(bool with_out_socket = true) const;
NodeItem create_node(const std::string &category, NodeItem::Type type);
NodeItem create_node(const std::string &category,
NodeItem::Type type,

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

@@ -178,8 +178,7 @@ NODE_SHADER_MATERIALX_BEGIN
#ifdef WITH_MATERIALX
{
/* Getting node name for Color output. This name will be used for <image> node. */
std::string image_node_name = node_name();
image_node_name = image_node_name.substr(0, image_node_name.rfind('_')) + "_Color";
std::string image_node_name = node_name(false) + "_Color";
NodeItem res = empty();
res.node = graph_->getNode(image_node_name);