Make adding a subasset label return a result for if there is a duplicate label.#18013
Merged
alice-i-cecile merged 3 commits intobevyengine:mainfrom Feb 24, 2025
Merged
Make adding a subasset label return a result for if there is a duplicate label.#18013alice-i-cecile merged 3 commits intobevyengine:mainfrom
alice-i-cecile merged 3 commits intobevyengine:mainfrom
Conversation
andriyDev
added
C-Bug
andriyDev
force-pushed
the
nested-labels
branch
from
d911cc3 to
738c485
Compare
andriyDev
force-pushed
the
nested-labels
branch
from
738c485 to
75e4c37
Compare
andriyDev
force-pushed
the
nested-labels
branch
from
75e4c37 to
785c795
Compare
pcwalton
approved these changes
Feb 24, 2025
Contributor
pcwalton
left a comment
pcwalton
left a comment
There was a problem hiding this comment.
LGTM. Of course we should have some kind of solution for the problem, but this will at least prevent others from suffering the same difficulty debugging the issue.
alice-i-cecile
added
S-Needs-Review
alice-i-cecile
approved these changes
Feb 24, 2025
alice-i-cecile
added
S-Ready-For-Final-Review
pcwalton
added a commit
to pcwalton/bevy
that referenced
this pull request
Feb 25, 2025
Currently, we reload a glTF skin each time we encounter a node that references it. By checking for duplicates, PR bevyengine#18013 turned this into a fatal error. But this was always wasteful. This commit fixes the issue by caching each skin by its index as we load it. The Maya babylon.js export plugin likes to emit glTFs with multiple nodes that reference the same skin, so this effectively unbreaks Maya rigs.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 25, 2025
Currently, we reload a glTF skin each time we encounter a node that references it. By checking for duplicates, PR #18013 turned this into a fatal error. But this was always wasteful. This commit fixes the issue by caching each skin by its index as we load it. The Maya babylon.js export plugin likes to emit glTFs with multiple nodes that reference the same skin, so this effectively unbreaks Maya rigs.
andriyDev
added a commit
to andriyDev/bevy
that referenced
this pull request
Mar 27, 2025
…a duplicate label. (bevyengine#18013)" This reverts commit ed1143b.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 27, 2025
# Objective - Fixes #18010. ## Solution - 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. ## Testing - This is just a revert. --- ## Migration Guide <Remove the migration guides for #15481 and #18013> I will make a PR to the bevy_website repo after this is merged.
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
LoadContext::add_labeled_assetand friends return an error if it finds a duplicate asset.Testing
Migration Guide
AssetLoaders must now handle the case of a duplicate subasset label when usingLoadContext::add_labeled_assetand its variants. If you know your subasset labels are unique by construction (e.g., they include an index number), you can simply unwrap this result.