diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
| commit | ab4126f51061277e87b41c48b40e7b54942d4eca (patch) | |
| tree | c58168b60323c4d43b58743b099e562a89e60a56 /core/globals.cpp | |
| parent | 8b15b26eedad4fdd33d50f5f9aa0fcc1875d503f (diff) | |
| parent | 914015f3b63dd956e72ea937d46ea4b2db005ada (diff) | |
| download | redot-engine-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index b822f52f15..bef40ff330 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -54,7 +54,7 @@ String Globals::localize_path(const String& p_path) const { if (resource_path=="") return p_path; //not initialied yet - if (p_path.begins_with("res://") || p_path.begins_with("user://")) + if (p_path.begins_with("res://") || p_path.begins_with("user://") || p_path.is_abs_path()) return p_path.simplify_path(); |