diff options
| author | Fabio Alessandrelli | 2016-10-13 11:30:04 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-17 20:49:12 +0200 |
| commit | ea48675ffa5eb75c219c3a4f75d7b904ac763bf3 (patch) | |
| tree | 289f53e2d0b9106e8ecbcf5ff8f277c31e636961 /core/globals.cpp | |
| parent | d5ee98bb2ca80354737632d215b27088e42b602d (diff) | |
| download | godot-ea48675ffa5eb75c219c3a4f75d7b904ac763bf3.tar.gz godot-ea48675ffa5eb75c219c3a4f75d7b904ac763bf3.tar.zst godot-ea48675ffa5eb75c219c3a4f75d7b904ac763bf3.zip | |
Properly handle absolute paths in Globals::localize_path
This give a proper fix for #4280 - #3106 , allowing absolute paths
that starts from the file system, not the resource folder
(cherry picked from commit 2f2cea070e062415f290103f1823ab17ea4e5874)
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 3f0edd68f..da9407e19 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(); |