Skip to content
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

MAYA-107463 Make sure we leave default material mode when the test ends. Check fo… #1552

Merged
merged 3 commits into from
Jul 7, 2021
Merged

MAYA-107463 Make sure we leave default material mode when the test ends. Check fo… #1552

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0172759
Make sure we leave default material mode when the test ends. Check fo…
Jul 6, 2021
e5fbde8
Check for the correct version.
Jul 6, 2021
b941cb6
Merge branch 'dev' into krickw/MAYA-107463/test_robustness
Jul 7, 2021
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
2 changes: 1 addition & 1 deletion lib/mayaUsd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if (MAYA_API_VERSION VERSION_GREATER_EQUAL 20220100 AND MAYA_API_VERSION VERSION
)
endif()

if (MAYA_API_VERSION VERSION_GREATER_EQUAL 20230000 AND UFE_VERSION VERSION_GREATER_EQUAL 2.0.3)
if (MAYA_API_VERSION VERSION_GREATER_EQUAL 20230000 AND UFE_VERSION VERSION_GREATER_EQUAL 0.3.0)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Building with master I discovered this expression was wrong.

target_compile_definitions(${PROJECT_NAME}
PRIVATE
HAS_DEFAULT_MATERIAL_SUPPORT_API=1
Expand Down
7 changes: 7 additions & 0 deletions test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ def setUpClass(cls):

cls._testDir = os.path.abspath('.')

@classmethod
def tearDownClass(cls):
panel = mayaUtils.activeModelPanel()
cmds.modelEditor(panel, edit=True, useDefaultMaterial=False)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If testInstanceDefaultMaterial fails the image test while useDefaultMaterial is enabled the rest of the script doesn't run to turn it off. I have to set useDefaultMaterial false in the tearDownClass so other scripts will not have it on, and also at the start of the other test runs within this script to ensure they don't have it on.

def assertSnapshotClose(self, imageName):
baselineImage = os.path.join(self._baselineDir, imageName)
snapshotImage = os.path.join(self._testDir, imageName)
Expand All @@ -64,6 +69,8 @@ def assertSnapshotClose(self, imageName):
def _StartTest(self, testName):
cmds.file(force=True, new=True)
mayaUtils.loadPlugin("mayaUsdPlugin")
panel = mayaUtils.activeModelPanel()
cmds.modelEditor(panel, edit=True, useDefaultMaterial=False)
self._testName = testName
testFile = testUtils.getTestScene("instances", self._testName + ".usda")
mayaUtils.createProxyFromFile(testFile)
Expand Down