Merge pull request #3961 from Autodesk/gamaj/MAYA-135290/add_open_pbr…

…_support Add support for OpenPBR as default material
Autodesk · Oct 16, 2024 · dae864e · dae864e
2 parents 3a22af3 + 08ea7b8
commit dae864e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/...DataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png b/...DataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png
diff --git a/...taTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png b/...taTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png
diff --git a/...st/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png b/...st/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png
diff --git a/...ine/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png b/...ine/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
@@ -56,8 +56,11 @@ def setUpClass(cls):
         cls._testDir = os.path.abspath('.')
 
         cls._imageVersion = None
-        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+        defaultSurfaceName = maya.mel.eval("defaultShaderName")
+        if defaultSurfaceName == "lambert1":
             cls._imageVersion = 'lambertDefaultMaterial'
+        elif defaultSurfaceName == "openPBRSurface1":
+            cls._imageVersion = 'openPBRSurfaceDefaultMaterial'
 
     @classmethod
     def tearDownClass(cls):