Skip to content

HYDRA-2274 : more fixes for usd 26.05 unit tests - #461

Merged
lanierd-adsk merged 14 commits into
devfrom
lanierd/HYDRA-2274bis
Jun 29, 2026
Merged

HYDRA-2274 : more fixes for usd 26.05 unit tests#461
lanierd-adsk merged 14 commits into
devfrom
lanierd/HYDRA-2274bis

Conversation

@lanierd-adsk

Copy link
Copy Markdown
Collaborator

No description provided.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Updates the Maya-to-Hydra test suite and scene-browser tests to accommodate OpenUSD 26.05 behavior changes by introducing new usd26.05+ baseline sets and adjusting traversal/value formatting to match updated Hydra UI output.

Changes:

  • Add usd26.05+ baseline image folders (and documentation) for USDLights, ArnoldLights, and TexturedMode tests.
  • Update Python snapshot tests to select the correct baseline version based on detected USD version (25.11 vs 26.05+), and adjust viewport setup for textured-mode testing.
  • Update adskHydraSceneBrowser tests to match Hydra UI sorting/top-level behavior (USD 25.11+) and to handle HdPrimOriginSchema::OriginPath value formatting in USD 26.05.

Reviewed changes

Copilot reviewed 9 out of 23 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/usd26.05+/BASELINES.md Documents new USD 26.05+ baseline expectations and rationale.
test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/usd25.11/domeLight.png Baseline image update (binary).
test/lib/mayaUsd/render/mayaToHydra/TexturedModeTest/usd26.05+/BASELINES.md Documents new USD 26.05+ textured-mode baselines and rationale.
test/lib/mayaUsd/render/mayaToHydra/testUSDLights.py Selects 25.11 vs 26.05+ baseline folders and passes imageVersion to snapshots.
test/lib/mayaUsd/render/mayaToHydra/testTexturedMode.py Uses active editor panel, adjusts display appearance, and adds USD 26.05+ gating.
test/lib/mayaUsd/render/mayaToHydra/testArnoldLights.py Selects 25.11 vs 26.05+ baseline folders and passes imageVersion to snapshots.
test/lib/mayaUsd/render/mayaToHydra/ArnoldLightsTest/usd26.05+/BASELINES.md Documents new USD 26.05+ ArnoldLights baselines and rationale.
test/lib/mayaUsd/render/mayaToHydra/ArnoldLightsTest/usd25.11/allLights.png Baseline image update (binary).
lib/mayaHydra/mayaPlugin/renderOverride.cpp Tracks initial textured state when creating the prune-textures scene index.
lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.h Adjusts test helper signature and includes <stack>.
lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.cpp Matches Hydra UI ordering and fixes value formatting for OriginPath on USD 26.05.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread test/lib/mayaUsd/render/mayaToHydra/testTexturedMode.py Outdated

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 23 changed files in this pull request and generated 1 comment.

Comment thread lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.cpp

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 23 changed files in this pull request and generated 3 comments.

Comment thread test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/usd26.05+/BASELINES.md Outdated
Comment thread test/lib/mayaUsd/render/mayaToHydra/ArnoldLightsTest/usd26.05+/BASELINES.md Outdated
Comment thread test/lib/mayaUsd/render/mayaToHydra/TexturedModeTest/usd26.05+/BASELINES.md Outdated
@lanierd-adsk lanierd-adsk self-assigned this Jun 24, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 23 changed files in this pull request and generated 2 comments.

Comment on lines +76 to +80
self.assertSnapshotClose(
"untextured.png",
self.IMAGE_DIFF_FAIL_THRESHOLD,
self.IMAGE_DIFF_FAIL_PERCENT
self.IMAGE_DIFF_FAIL_PERCENT,
imageVersion
Comment on lines +135 to +144
int prevCount = -1;
int currCount = 0;
while (currCount != prevCount) {
prevCount = currCount;
treeWidget->expandAll();
// Process queued events: fires deferred QTimer::singleShot expansions
// and avoids crashes with since-deleted items (see original comment).
QApplication::processEvents(QEventLoop::ProcessEventsFlag::EventLoopExec);
currCount = CountTreeItems(treeWidget);
}
const bool pruneTextures = !(drawContext.getDisplayStyle() & MHWRender::MFrameContext::kTextured);
_lastFilteringSceneIndexBeforeCustomFiltering = _pruneTexturesSceneIndex =
Fvp::PruneTexturesSceneIndex::New(_lastFilteringSceneIndexBeforeCustomFiltering, pruneTextures);
_currentlyTextured = !pruneTextures;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nice, I had this fix locally for materialX testing. Thanks for pushing this

benyoon-adsk
benyoon-adsk previously approved these changes Jun 25, 2026

@benyoon-adsk benyoon-adsk left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nice work!

…ailure

Co-authored-by: Cursor <cursoragent@cursor.com>
benyoon-adsk
benyoon-adsk previously approved these changes Jun 25, 2026
@lanierd-adsk
lanierd-adsk merged commit 3163273 into dev Jun 29, 2026
11 checks passed
@lanierd-adsk
lanierd-adsk deleted the lanierd/HYDRA-2274bis branch June 29, 2026 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants