Simplify updates to UnitTypeDef::getUnitDefs

autodesk-forks · Oct 12, 2024 · 50ede5b · 50ede5b
1 parent 51c4f55
commit 50ede5b
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/source/MaterialXCore/Definition.cpp b/source/MaterialXCore/Definition.cpp
@@ -186,21 +186,8 @@ StringVec TargetDef::getMatchingTargets() const
 vector<UnitDefPtr> UnitTypeDef::getUnitDefs() const
 {
     vector<UnitDefPtr> unitDefs;
-
-    // Gather from data library.
-    if (getDocument()->hasDataLibrary())
-    {
-        for (UnitDefPtr unitDef : getDocument()->getDataLibrary()->getChildrenOfType<UnitDef>())
-        {
-            if (unitDef->getUnitType() == _name)
-            {
-                unitDefs.push_back(unitDef);
-            }
-        }
-    }
-
-    // Gather from content document.
-    for (UnitDefPtr unitDef : getDocument()->getChildrenOfType<UnitDef>())
+
+    for (UnitDefPtr unitDef : getDocument()->getChildrenOfType<UnitDef>(EMPTY_STRING, getDocument()->getDataLibrary()))
     {
         if (unitDef->getUnitType() == _name)
         {
@@ -210,5 +197,4 @@ vector<UnitDefPtr> UnitTypeDef::getUnitDefs() const
 
     return unitDefs;
 }
-
 MATERIALX_NAMESPACE_END