浏览代码

Merge pull request #7172 from Faless/fix_localize_path

Properly localize absolute path that starts with the resource folder.
Rémi Verschelde 8 年之前
父节点
当前提交
830ab4ea8d
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      core/globals.cpp

+ 2 - 1
core/globals.cpp

@@ -54,7 +54,8 @@ String Globals::localize_path(const String& p_path) const {
 	if (resource_path=="")
 	if (resource_path=="")
 		return p_path; //not initialied yet
 		return p_path; //not initialied yet
 
 
-	if (p_path.begins_with("res://") || p_path.begins_with("user://") || p_path.is_abs_path())
+	if (p_path.begins_with("res://") || p_path.begins_with("user://") ||
+		(p_path.is_abs_path() && !p_path.begins_with(resource_path)))
 		return p_path.simplify_path();
 		return p_path.simplify_path();