Patch usddiff for USDZ containing crate layers #3438
+61
−24
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change(s)
The underlying layers need to be converted to usda before they are diffed.
Previously a crate layer within a USDZ would produce the following failure when run through usddiff:
Note that there are 2 test changes here:
testDiffToolIterateUsdz
, but with the internalbasic.usda
converted tobasic.usdc
.a.usdz
andb.usdz
, usingusdcat
to convert the layer, thenusdzip
to make the new archives.testDiffToolIterateUsdz
_runDiff
is called unconditionally on non-zipped layers, so should also be called unconditionally on internal layers. Previously, whitespace diffs in USDA layers would cause failures when embedded in USDZ, but would not cause failures if extracted first & diff'd outside the USDZ. Now the diff result is consistent whether the usda is tested on its own or within an archive.Checklist
testing guidelines)
Contributor License Agreement instructions)