godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72452 from akien-mga/global_class_always_create 

Always create global class list, even if empty
This commit is contained in:
Rémi Verschelde 2023-01-31 16:00:12 +01:00
parent 925784df03 38a806e13f
commit 8612c12be6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config/project_settings.cpp
View File

@ -1138,7 +1138,7 @@ Array ProjectSettings::get_global_class_list() {
Ref<ConfigFile> cf; Ref<ConfigFile> cf;
cf.instantiate(); cf.instantiate();
if (cf->load(get_global_class_list_path()) == OK) { if (cf->load(get_global_class_list_path()) == OK) {
script_classes = cf->get_value("", "list"); script_classes = cf->get_value("", "list", Array());
} else { } else {
#ifndef TOOLS_ENABLED #ifndef TOOLS_ENABLED
// Script classes can't be recreated in exported project, so print an error. // Script classes can't be recreated in exported project, so print an error.

2
editor/editor_file_system.cpp
View File

@ -1593,7 +1593,7 @@ void EditorFileSystem::_update_pending_script_classes() {
_update_script_classes(); _update_script_classes();
} else { } else {
// In case the class cache file was removed somehow, regenerate it. // In case the class cache file was removed somehow, regenerate it.
if (ScriptServer::has_global_classes() && !FileAccess::exists(ScriptServer::get_global_class_cache_file_path())) { if (!FileAccess::exists(ScriptServer::get_global_class_cache_file_path())) {
ScriptServer::save_global_classes(); ScriptServer::save_global_classes();
} }
} }