godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

-Renamed GlobalConfig to ProjectSettings, makes more sense.

Browse Source 
-Added system for feature overrides, it's pretty cool :)
This commit is contained in:
Juan Linietsky
2017-07-19 17:00:46 -03:00
parent 89588d4334
commit 25678b1876
162 changed files with 1296 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/file_access_memory.cpp
View File

@@ -29,7 +29,7 @@
/*************************************************************************/
#include "file_access_memory.h"
#include "global_config.h"
#include "project_settings.h"
#include "map.h"
#include "os/copymem.h"
#include "os/dir_access.h"
@@ -43,8 +43,8 @@ void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) {
}
String name;
if (GlobalConfig::get_singleton())
name = GlobalConfig::get_singleton()->globalize_path(p_name);
if (ProjectSettings::get_singleton())
name = ProjectSettings::get_singleton()->globalize_path(p_name);
else
name = p_name;
//name = DirAccess::normalize_path(name);