Consider defaultgeomprop when validating an input.

Fix validation ordering for graph to avoid errors due to the fact the libraries are not loaded before validation occurs.
AcademySoftwareFoundation · Jun 23, 2023 · 2bfb093 · 2bfb093
1 parent 9aa9b3a
commit 2bfb093
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/source/MaterialXCore/Interface.cpp b/source/MaterialXCore/Interface.cpp
@@ -339,7 +339,16 @@ bool Input::validate(string* message) const
     {
         bool hasValueBinding = hasValue();
         bool hasConnection = hasNodeName() || hasNodeGraphString() || hasOutputString() || hasInterfaceName();
-        validateRequire(hasValueBinding || hasConnection, res, message, "Node input binds no value or connection");
+        bool hasDefaultGeomProp = false;
+        if (!hasConnection && !hasValueBinding)
+        {
+            ConstNodePtr node = parent->asA<Node>();
+            ConstNodeDefPtr nodeDef = node->getNodeDef();
+            InputPtr input = nodeDef ? nodeDef->getInput(getName()) : nullptr;
+            if (input && input->hasDefaultGeomPropString())
+                hasDefaultGeomProp = true;
+        }
+        validateRequire(hasValueBinding || hasConnection || hasDefaultGeomProp, res, message, "Node input binds no value or connection");
     }
     else if (parent->isA<NodeGraph>())
     {

diff --git a/source/MaterialXGraphEditor/Graph.cpp b/source/MaterialXGraphEditor/Graph.cpp
@@ -172,6 +172,7 @@ mx::DocumentPtr Graph::loadDocument(mx::FilePath filename)
     };
 
     mx::DocumentPtr doc = mx::createDocument();
+    doc->importLibrary(_stdLib);
     try
     {
         if (!filename.isEmpty())
@@ -4047,7 +4048,6 @@ void Graph::drawGraph(ImVec2 mousePos)
         std::string graphName = fileName.getBaseName();
         _currGraphName.push_back(graphName.substr(0, graphName.length() - 5));
         _graphDoc = loadDocument(fileName);
-        _graphDoc->importLibrary(_stdLib);
 
         _initial = true;
         buildUiBaseGraph(_graphDoc);