Skip to content

Improve handling of top-level inputs in Graph Editor #2830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 7 commits into from
Apr 12, 2026
+35 −9
Merged

Improve handling of top-level inputs in Graph Editor #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64cc179
- Fix interface search traversal for connection setting.
kwokcb Mar 18, 2026
68d6e06
Merge branch 'AcademySoftwareFoundation:main' into root_input_fixes
kwokcb Apr 1, 2026
afb58ed
Merge branch 'main' into root_input_fixes
jstone-lucasfilm Apr 3, 2026
2575cc8
Merge branch 'AcademySoftwareFoundation:main' into root_input_fixes
kwokcb Apr 5, 2026
acf6c2b
Merge branch 'AcademySoftwareFoundation:main' into root_input_fixes
kwokcb Apr 8, 2026
78395ae
Merge branch 'main' into root_input_fixes
kwokcb Apr 9, 2026
1345dbf
Merge branch 'AcademySoftwareFoundation:main' into root_input_fixes
kwokcb Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions source/MaterialXCore/Interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,13 @@ void Input::setConnectedInterfaceName(const string& interfaceName)
if (!interfaceName.empty())
{
ConstGraphElementPtr graph = getAncestorOfType<GraphElement>();
if (graph && graph == getParent())
Copy link
Copy Markdown
Contributor Author

@kwokcb kwokcb Mar 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jstone-lucasfilm . This is the same fix you put in for validation. Would otherwise fail silently leaving Mtlx doc and UiNode graph with different connections.

{
// This element is a direct child of a graph element, so its
// interface name references a value element in the parent scope.
ConstElementPtr graphParent = graph->getParent();
graph = graphParent ? graphParent->getAncestorOfType<GraphElement>() : nullptr;
}
if (graph && graph->getInput(interfaceName))
{
setInterfaceName(interfaceName);
Expand Down
37 changes: 28 additions & 9 deletions source/MaterialXGraphEditor/Graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3324,35 +3324,54 @@ void Graph::propertyEditor()
}
else if (_currUiNode->getInput())
{
mx::InputPtr currUINodeInput = _currUiNode->getInput();

if (temp != original)
{
std::string name = _currUiNode->getInput()->getParent()->createValidChildName(temp);
std::vector<UiNodePtr> downstreamNodes = _currUiNode->getOutputConnections();
for (UiNodePtr uiNode : downstreamNodes)
std::string name = currUINodeInput->getParent()->createValidChildName(temp);

for (UiNodePtr uiNode : _currUiNode->getOutputConnections())
{
// Is not an input port
if (uiNode->getInput() == nullptr)
{
// Is a node
if (uiNode->getNode())
{
for (mx::InputPtr input : uiNode->getNode()->getActiveInputs())
{
if (input->getInterfaceInput() == _currUiNode->getInput())
if (input->getInterfaceInput() == currUINodeInput)
{
_currUiNode->getInput()->setName(name);
mx::ValuePtr val = _currUiNode->getInput()->getValue();
currUINodeInput->setName(name);
input->setConnectedInterfaceName(name);
}
}
}
// Is a node graph
else if (uiNode->getNodeGraph())
Copy link
Copy Markdown
Contributor Author

@kwokcb kwokcb Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch of logic was missing to handle upstream interfaces to nodegraphs.

{
for (mx::InputPtr input : uiNode->getNodeGraph()->getActiveInputs())
{
if (input->getInterfaceName() == currUINodeInput->getName())
{
currUINodeInput->setName(name);
input->setConnectedInterfaceName(name);
mx::InputPtr pt = input->getInterfaceInput();
}
}
}
else
{
uiNode->getOutput()->setConnectedNode(_currUiNode->getNode());
// Is an output port
mx::OutputPtr outputPtr = uiNode->getOutput();
if (outputPtr)
Copy link
Copy Markdown
Contributor Author

@kwokcb kwokcb Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Firewall check if no outputs.

{
outputPtr->setConnectedNode(_currUiNode->getNode());
}
}
}
}

_currUiNode->getInput()->setName(name);
currUINodeInput->setName(name);
_currUiNode->setName(name);
}
}
Expand Down