Fix UsdUtilsFlattenLayerStack to apply the resolveAssetPathFn to clip manifest and asset paths #1266
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tPathFn when flattening layers with value clips.
…ated when using a resolveAssetPathFn.
hughes123b
approved these changes
Jul 15, 2020
|
Filed as internal issue #USD-6219. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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)
In the _FixAssetPaths function, check for a clip dictionary. If found, update the manifestAssetPath and assetPaths data, also using _FixAssetPaths. Updated the FlattenLayerStack test to validate that the paths are updated. Because the clip times and asset paths are updated independently, this could be made more efficient at the expense of greater code rearrangement and complexity. But, as validated by the test, updating the clip info twice (in _ApplyLayerOffset and again in _FixAssetPaths) does work properly.
Note that this change does not apply the resolve function to the templateAssetPath metadata, because it's not totally clear how that kind of patterned path should be resolved.
Fixes Issue(s)