summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-06-06 22:06:58 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-06-06 22:06:58 -0300
commitb524b40fdc5325c840192ce92dbed8108ccef2d9 (patch)
treeec7f74db082b4b91f7614ed4391c53bc73b60bfd /core/io
parent14c4c1b568ffa40a179332fbc77e9b52c6bdf514 (diff)
-fixed many memory initialization issues
-fixed deadlock on previews thread -fixed compilation errors on unix
Diffstat (limited to 'core/io')
-rw-r--r--core/io/resource_loader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 03b6c9759b..22d89840ae 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -214,6 +214,7 @@ RES ResourceLoader::load(const String &p_path,const String& p_type_hint,bool p_n
Ref<ResourceImportMetadata> ResourceLoader::load_import_metadata(const String &p_path) {
+
String local_path;
if (p_path.is_rel_path())
local_path="res://"+p_path;