MAYA-126179 merge-to-USD into variants #2764
Merged
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
Code refactor: - Add a get method on the orphaned node manager to access the saved variant sets. - Expose more helping functions to convert to text the orphaned node manager data, to help debugging. Fix mid-merge orphaning: - Move where the orphaned node manager data for a pulled prim is removed when merging to USD. - This is necessary because while merging, USD sends out notifications which would trigger the orphaned node manage mid-merge and cause havok. Support merging into variants: - Add support to merge into variants in mergePrims(). - This involves augmenting the target path with variant selections for intermediary prims and to create a edit target for any final variant selection. - We need two different ways to handle variant selections because SdfCopySpec() has a bug that prevents it from copying into a target path that ends with a variant selection. - Fix how we determine if merge to USD should be enabled. - Fix prim retrieval during merge when calling GetPrimAtPath. The function GetPrimAtPath in USD does not support variant selection. (Surprisingly, IMO.) So we need to explicitly strip variant selection when retrieving a prim. This API limitation is both unintuitive and error-prone: given that the function does not support variant selection, why does it not ignore them? This fix makes merging into sub-variants (variant within variant) work.
- Add an option to ignore variants to the MergePrims function. - This allows not modifying the edit target and destination path when the caller has already set everything up. - This happens when vopying the transform to the Maya Ref. - Fix typos in comments.
Test that editing a vairant in a variant gets the correct results.
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.
Code refactor:
Fix mid-merge orphaning:
Support merging into variants:
The function GetPrimAtPath in USD does not support variant selection. (Surprisingly, IMO.) So we need to explicitly strip variant selection when retrieving a prim. This API limitation is both non-intuitive and error-prone: given that the function does not support variant selection, why does it not ignore them? This fix makes merging into sub-variants (variant within variant) work.