Add null check in getShaderNodes (#2228)

jstone-lucasfilm · web-flow · commit e13344ba1332 · 2025-02-14T12:22:48.000-08:00
This changelist adds a missing null check in getShaderNodes, handling the edge case of an invalid output string.  Previously, this edge case would trigger a crash in MaterialXCore, and now it correctly generates validation warnings and proceeds.
diff --git a/source/MaterialXCore/Material.cpp b/source/MaterialXCore/Material.cpp
@@ -50,7 +50,11 @@ vector<NodePtr> getShaderNodes(NodePtr materialNode, const string& nodeType, con
             vector<OutputPtr> outputs;
             if (input->hasOutputString())
             {
-                outputs.push_back(nodeGraph->getOutput(input->getOutputString()));
+                OutputPtr connectedOutput = nodeGraph->getOutput(input->getOutputString());
+                if (connectedOutput)
+                {
+                    outputs.push_back(connectedOutput);
+                }
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,11 @@ vector<NodePtr> getShaderNodes(NodePtr materialNode, const string& nodeType, con`
`50`	`50`	`vector<OutputPtr> outputs;`
`51`	`51`	`if (input->hasOutputString())`
`52`	`52`	`{`
`53`		`- outputs.push_back(nodeGraph->getOutput(input->getOutputString()));`
	`53`	`+ OutputPtr connectedOutput = nodeGraph->getOutput(input->getOutputString());`
	`54`	`+ if (connectedOutput)`
	`55`	`+ {`
	`56`	`+ outputs.push_back(connectedOutput);`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`	`else`
`56`	`60`	`{`