diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-14 18:14:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 18:14:05 +0200 |
| commit | 5e373c2a6926705b52a116ca00e5eff131b98274 (patch) | |
| tree | 4905f343cd95f7a2698862083a766f0832911a19 /core | |
| parent | 2f57249c29d35c7396209213e7e5b39bc328b3f4 (diff) | |
| parent | 2f2cea070e062415f290103f1823ab17ea4e5874 (diff) | |
Merge pull request #6813 from Faless/fix_6801_bis
Re-Allow absolute paths, make them behave correctly
Diffstat (limited to 'core')
| -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(); |