EMSUSD-277 fix lost muted anonymous layers #3320
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
Collaborator
pierrebai-adsk
commented
Sep 8, 2023
pierrebai-adsk
commented
- Add a global functionality to hold onto muted layers.
- This is to work around the fact that OpenUSD will not keep muted layers in memory.
- Make sure to clean up the list of muted layers when a new Maya scene is created.
- Use the muted layer holder in the MuteLayer command.
- The base class of the command was trying to hold onto layer, but when the undo stack is cleared, so would be the anonymous layers.
- In particular, when unloading a Maya Reference, Maya always clears the undo stack.
- Add a test that check if muted anonymous layers are lost when editing a Maya Reference.
- The test fails without my fix, works with it.
- Improved test helper functions to enable creating anonymous sub-layers.
- Add a global functionality to hold onto muted layers. - This is to work around the fact that OpenUSD will not keep muted layers in memory. - Make sure to clean up the list of muted layers when a new Maya scene is created. - Use the muted layer holder in the MuteLayer command. - The base class of the command was trying to hold onto layer, but when the undo stack is cleared, so would be the anonymous layers. - In particular, when unloading a Maya Reference, Maya always clears the undo stack. - Add a test that check if muted anonymous layers are lost when editing a Maya Reference. - The test fails without my fix, works with it. - Improved test helper functions to enable creating anonymous sub-layers.
pierrebai-adsk
force-pushed
the
bailp/EMSUSD-277/losing-muted-anon-layers
branch
from
f3777ff to
5907c81
Compare
| @@ -620,7 +621,7 @@ class MuteLayer : public BaseCmd | |||
| // we perfer not holding to pointers needlessly, but we need to hold on to the layer if we | |||
| // mute it otherwise usd will let go of it and its modifications, and any dirty children | |||
| // will also be lost | |||
There was a problem hiding this comment.
I dont think we need this comment anymore, so does L643
There was a problem hiding this comment.
Actually, the comment says exactly why we are calling addMutedLayer, so I'll keep the comment.
| // we can release the pointer | ||
| _mutedLayer = nullptr; | ||
| removeMutedLayer(layer); |
There was a problem hiding this comment.
Question here: In AddMutedLayer, we recursively added all dirty sublayers to the mutedLayer list, so when remvoeMutedLayer should we do the same? For now it just removes one layer.
There was a problem hiding this comment.
You're right, I will look into it.
Also, improve comments explaining why we add and remove muted layers.
samuelliu-adsk
approved these changes
Sep 13, 2023
pierrebai-adsk
added
the
ready-for-merge
seando-adsk
added
core
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.