Boudrey/maya 123462/pullset remove #2386
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
…ng as Maya Undo was already working but not cancelling editing. It is now fixed.
| @@ -1156,6 +1156,28 @@ bool PrimUpdaterManager::discardPrimEdits(const Ufe::Path& pulledPath) | |||
| return false; | |||
| } | |||
|
|
|||
| // Discard of the pull set if it is empty. | |||
There was a problem hiding this comment.
Should mergeToUsd also get rid of the set? IDK why the task only complained about discard... you did as the task specified, but ask Natalia if the set should also go away when the last edited prim is merged, too.
There was a problem hiding this comment.
Good idea, easy to do.
There was a problem hiding this comment.
Maybe Natalia wanted to keep the set around for some reason. I don't think so, but it would be good to confirm.
pierrebai-adsk
previously approved these changes
May 27, 2022
pierrebai-adsk
approved these changes
May 27, 2022
boudrey
added
the
ready-for-merge
|
Only failing test is unrelated to my change. |
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.
No description provided.