Revert PR #15481 to resolve a regression.#18567
Merged
mockersf merged 2 commits intobevyengine:mainfrom Mar 27, 2025
Merged
Conversation
…a duplicate label. (bevyengine#18013)" This reverts commit ed1143b.
…sset` (bevyengine#15481)" This reverts commit f176448.
andriyDev
added
A-Assets
Contributor
Author
|
I should mention that there is more context for why we are doing a revert #18295 (comment) |
cart
approved these changes
Mar 27, 2025
Member
cart
left a comment
cart
left a comment
There was a problem hiding this comment.
Thanks for being understanding here. Excited to iterate on this with you!
mockersf
approved these changes
Mar 27, 2025
mockersf
pushed a commit
that referenced
this pull request
Mar 27, 2025
- Fixes #18010. - Revert the offending PRs! These are #15481 and #18013. We now no longer get an error if there are duplicate subassets. - In theory we could untangle #18013 from #15481, but that may be tricky, and may still introduce regressions. To avoid this worry (since we're already in RC mode), I am just reverting both. - This is just a revert. --- <Remove the migration guides for #15481 and #18013> I will make a PR to the bevy_website repo after this is merged.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Objective
Solution
labeled_assetsfromLoadedAssetandErasedLoadedAsset#15481 and Make adding a subasset label return a result for if there is a duplicate label. #18013. We now no longer get an error if there are duplicate subassets.labeled_assetsfromLoadedAssetandErasedLoadedAsset#15481, but that may be tricky, and may still introduce regressions. To avoid this worry (since we're already in RC mode), I am just reverting both.Testing
Migration Guide
<Remove the migration guides for #15481 and #18013>
I will make a PR to the bevy_website repo after this is merged.