mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-27 11:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73595 from KoBeWi/missingno

Browse Source 
Fix missing directories when exporting from cmd
This commit is contained in:
Rémi Verschelde 2023-02-21 11:14:34 +01:00
commit 6acc7f03ed
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/config/project_settings.cpp
View File

@ -656,6 +656,7 @@ Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bo
Compression::gzip_level = GLOBAL_GET("compression/formats/gzip/compression_level");
project_loaded = err == OK;
return err;
}
@ -1106,6 +1107,10 @@ bool ProjectSettings::is_using_datapack() const {
return using_datapack;
}
bool ProjectSettings::is_project_loaded() const {
return project_loaded;
}
bool ProjectSettings::_property_can_revert(const StringName &p_name) const {
if (!props.has(p_name)) {
return false;

2
core/config/project_settings.h
View File

@ -95,6 +95,7 @@ protected:
String resource_path;
HashMap<StringName, PropertyInfo> custom_prop_info;
bool using_datapack = false;
bool project_loaded = false;
List<String> input_presets;
HashSet<String> custom_features;
@ -190,6 +191,7 @@ public:
Variant get_setting_with_override(const StringName &p_name) const;
bool is_using_datapack() const;
bool is_project_loaded() const;
bool has_custom_feature(const String &p_feature) const;

2
editor/editor_paths.cpp
View File

@ -218,7 +218,7 @@ EditorPaths::EditorPaths() {
// Validate or create project-specific editor data dir,
// including shader cache subdir.
if (Engine::get_singleton()->is_project_manager_hint() || Main::is_cmdline_tool()) {
if (Engine::get_singleton()->is_project_manager_hint() || (Main::is_cmdline_tool() && !ProjectSettings::get_singleton()->is_project_loaded())) {
// Nothing to create, use shared editor data dir for shader cache.
Engine::get_singleton()->set_shader_cache_path(data_dir);
} else {