From 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Thu, 5 Jan 2017 09:16:00 -0300
Subject: -Changed most project settings in the engine, so they have major and
 minor categories. -Changed SectionedPropertyEditor to support this -Renamed
 Globals singleton to GlobalConfig, makes more sense. -Changed the logic
 behind persisten global settings, instead of the persist checkbox, a revert
 button is now available

---
 core/os/dir_access.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/os/dir_access.cpp')

diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
index 7b60baeeb..804fe15c3 100644
--- a/core/os/dir_access.cpp
+++ b/core/os/dir_access.cpp
@@ -37,7 +37,7 @@ String DirAccess::_get_root_path() const {
 
 	switch(_access_type) {
 
-		case ACCESS_RESOURCES: return Globals::get_singleton()->get_resource_path();
+		case ACCESS_RESOURCES: return GlobalConfig::get_singleton()->get_resource_path();
 		case ACCESS_USERDATA: return OS::get_singleton()->get_data_dir();
 		default: return "";
 	}
@@ -204,10 +204,10 @@ String DirAccess::fix_path(String p_path) const {
 
 		case ACCESS_RESOURCES: {
 
-			if (Globals::get_singleton()) {
+			if (GlobalConfig::get_singleton()) {
 				if (p_path.begins_with("res://")) {
 
-					String resource_path = Globals::get_singleton()->get_resource_path();
+					String resource_path = GlobalConfig::get_singleton()->get_resource_path();
 					if (resource_path != "") {
 
 						return p_path.replace_first("res:/",resource_path);
-- 
cgit v1.2.3-70-g09d2