T bailp/maya 115146/maya ref naming 2 #2350
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
Based on Yves Boudreault's branch. Simplified it a bit after merging - Add an environment variable MAYAUSD_ENABLE_MAYA_REFERENCE_OLD_BEHAVIOUR to use the old behaviour in AL. - Keeps the Maya Ref node name in a custom attribute. - Requires that the attribute be directly on the prim, not in a lower layer or indirect reference. - This allows having a different Maya Ref Node for each prim even if they are built from teh same substrate. - Adds more unit tests.
Improve the code to avoid having two Maya Ref that happen to refer to the same reference file use each other's Maya Ref Node by accident. The subtle change is that we no longer search for the corresponding Maya Ref Node if the custom attribute is not present. When the attribute is not present, it means the Maya Ref was never edited and thus need to create its own Maya Ref Node, not search for an existing one. I also refactored the code to avoid some code duplication and push out some code into their own functions for clarity. - Make all ref-node-name generator always generate the full name, including any RN suffix. - Renamed isMayaReference() to useNewMayaRefNaming() for clarity since that was the function's purpose. - Added setMayaRefCustomAttribute() and getMayaRefCustomAttribute() for clarity, isolation and reuse. - Got rid of getRefNodeNameFromPrim() since its only usage was to try to find a Maya Ref Node when the custom attribute was absent, which was incorrect and led to accidentally use the node from other Maya Ref. - De-duplicate the Maya ref node searching code. - Fixed the new test that simulated reparent a prim but did not simulate that the custom attribute would follow.
ppt-adsk
reviewed
May 12, 2022
|
Looking for some feedback on how this will affect the AL plugin. Would changing the naming scheme by default be a problem? |
Use legacy-oriented function and env, var names instead of new-oriented names to emphasize that it is code that might be removed in the future.
ppt-adsk
previously approved these changes
May 12, 2022
... use the length function instead.
ppt-adsk
approved these changes
May 12, 2022
|
Given that this is pretty much equivalent to what Yves had written and it was approved, I'm going to label this as ready for merge. |
pierrebai-adsk
added
the
ready-for-merge
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.
Based on Yves Boudreault's branch.
Simplified it a bit after merging, fixed issues with reconnecting to the wrong node.
From Yves's original code I kept:
Improve the code to avoid having two Maya Ref that happen to refer to the same reference file use each other's Maya Ref Node by accident.
The subtle change is that we no longer search for the corresponding Maya Ref Node if the custom attribute is not present. When the attribute is not present, it means the Maya Ref was never edited and thus need to create its own Maya Ref Node, not search for an existing one.
I also refactored the code to avoid some code duplication and push out some code into their own functions for clarity.