Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ResourceLoader: Report error if resource type unrecognized #97370

Merged
merged 1 commit into from
Nov 10, 2024

Conversation

RandomShaper
Copy link
Member

@RandomShaper RandomShaper commented Sep 23, 2024

Fixed version of the reverted #95508.

Not tested yet, but maybe a brave reviewer can confirm this is good now.

Fixes #95490.

@RandomShaper RandomShaper added bug topic:core cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Sep 23, 2024
@RandomShaper RandomShaper added this to the 4.4 milestone Sep 23, 2024
@RandomShaper RandomShaper requested a review from a team as a code owner September 23, 2024 17:03
@RandomShaper
Copy link
Member Author

Cherry-pick for 4.3 included in #96606.

Copy link
Contributor

@Summersay415 Summersay415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works with suggested change. Fixes #95490 and does not reintroduce #97153.

P. S.: order matters...

core/io/resource_loader.cpp Outdated Show resolved Hide resolved
@RandomShaper
Copy link
Member Author

@Summersay415, I've integrated your changes and made further changes so error handling is clearer.

@clayjohn
Copy link
Member

clayjohn commented Nov 6, 2024

@RandomShaper Have you tested this now with the latest version?

@RandomShaper
Copy link
Member Author

Yes, works as expected.

Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems straightforward

@Repiteo Repiteo merged commit 155f94a into godotengine:master Nov 10, 2024
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Nov 10, 2024

Thanks!

@RandomShaper RandomShaper deleted the refix_rl_not_found branch November 11, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release topic:core
Projects
None yet
4 participants