Ray Molenkamp
ab106607bd
- OIIO 2.4.11.0 - OpenEXR 3.1.7 with additional fix for threadpool shutdown - FreeType 2.13.0 - Fmt 9.1.0 - Python 3.10.11 - Flac 1.4.2 - FFMpeg 6.0 - OpenSSL 1.1.1t - SQLite 3.40.1 - USD 23.05 with MaterialX Support and Render module Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Campbell Barton <campbell@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/107783
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff --git a/pxr/usd/usdMtlx/reader.cpp b/pxr/usd/usdMtlx/reader.cpp
|
|
index 29e901816..e6fc68b20 100644
|
|
--- a/pxr/usd/usdMtlx/reader.cpp
|
|
+++ b/pxr/usd/usdMtlx/reader.cpp
|
|
@@ -797,6 +797,15 @@ _NodeGraphBuilder::_CreateInterfaceInputs(
|
|
// We deliberately ignore tokens here.
|
|
}
|
|
|
|
+mx::StringSet _GetStdlibIncludes() {
|
|
+ mx::StringSet stdlibIncludes = UsdMtlxGetDocument("")->getReferencedSourceUris();
|
|
+ mx::StringSet normStdlibIncludes;
|
|
+ for (std::string const& entry : stdlibIncludes) {
|
|
+ normStdlibIncludes.insert(TfNormPath(entry));
|
|
+ }
|
|
+ return normStdlibIncludes;
|
|
+}
|
|
+
|
|
// Returns True if the mtlxNodeDef corresponds to a locally defined custom node
|
|
// with an associated nodegraph.
|
|
// XXX Locally defined custom nodes without nodegraphs are not supported
|
|
@@ -818,13 +827,14 @@ _NodeGraphBuilder::_IsLocalCustomNode(const mx::ConstNodeDefPtr &mtlxNodeDef)
|
|
}
|
|
// Combine with the nodeDef relative path
|
|
nodeDefUri = TfNormPath(fullMtlxPath + nodeDefUri);
|
|
+ } else {
|
|
+ nodeDefUri = TfNormPath(nodeDefUri);
|
|
}
|
|
|
|
// This is a locally defined custom node if the absolute path to the
|
|
// nodedef is not included in the stdlibDoc.
|
|
static mx::StringSet customNodeDefNames;
|
|
- static const mx::StringSet stdlibIncludes =
|
|
- UsdMtlxGetDocument("")->getReferencedSourceUris();
|
|
+ static const mx::StringSet stdlibIncludes = _GetStdlibIncludes();
|
|
if (stdlibIncludes.find(nodeDefUri) == stdlibIncludes.end()) {
|
|
// Check if we already used this custom node
|
|
if (std::find(customNodeDefNames.begin(), customNodeDefNames.end(),
|