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

Make default/project theme wait for modules before initializing #55483

Merged
merged 1 commit into from
Dec 2, 2021

Conversation

YuriSizov
Copy link
Contributor

@YuriSizov YuriSizov commented Nov 30, 2021

Fixes #54752. Fixes #55008.

I'm not sure if it's okay to add a new method to register_scene_types.h/cpp, but only other option I see immediately is moving this code to main.cpp, like so many other things. But that sounds way worse (it's crowded as is). As such, I've decided that the best approach is to keep the code in the same file.

The problem is that theme needs some modules to be loaded before it can attempt to be loaded itself, at least this is true for custom themes. But I've moved all related code to keep it all together (it shouldn't affect anything else, other than fix the issue at hand).

@akien-mga akien-mga merged commit 8c1fc56 into godotengine:master Dec 2, 2021
@akien-mga
Copy link
Member

Thanks!

@YuriSizov YuriSizov deleted the theme-load-and-order branch December 2, 2021 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants