Fix parent/child handling in getGeometryBindings (#1113)

The matching logic was reversed for membership, so that parent assignments would override child assignments. That is the logic should be to check if the path of the assignment is completely contained within the path to the geometry being tested.
AcademySoftwareFoundation · Oct 22, 2022 · 0ee79b2 · 0ee79b2
1 parent 8bd5164
commit 0ee79b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
@@ -605,7 +605,7 @@ export class Material
         // and assign to the associatged geometry. If there are no looks
         // then the first material is found and assignment to all the
         // geometry. 
-        this._materials = [];
+        this._materials.length = 0;
         this._defaultMaterial = null;
         var looks = doc.getLooks();
         if (looks.length)
@@ -633,6 +633,16 @@ export class Material
                         let newAssignment;
                         if (collection || geom)
                         {
+                            // Remove leading "/" from collection and geom for 
+                            // later assignment comparison checking
+                            if (collection && collection.charAt(0) == "/")
+                            {
+                                collection = collection.slice(1);
+                            }
+                            if (geom && geom.charAt(0) == "/")
+                            {
+                                geom = geom.slice(1);
+                            }
                             newAssignment = new MaterialAssign(shader, geom, collection);
                         }
                         else

diff --git a/source/MaterialXCore/Look.cpp b/source/MaterialXCore/Look.cpp
@@ -29,7 +29,7 @@ vector<MaterialAssignPtr> getGeometryBindings(ConstNodePtr materialNode, const s
         {
             if (matAssign->getReferencedMaterial() == materialNode)
             {
-                if (geomStringsMatch(geom, matAssign->getActiveGeom()))
+                if (geomStringsMatch(matAssign->getActiveGeom(), geom, true))
                 {
                     matAssigns.push_back(matAssign);
                     continue;