Merge pull request #29815 from NilsIrl/plus_file_1

Replace ` + "/" + ` with `String::file_add()`
2019-07-01 12:06:35 +02:00
parent b62041d1f3 d2833d4f4d
commit d17eac735c
17 changed files with 39 additions and 39 deletions
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@ -463,7 +463,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
 			}

 			if (!path.is_abs_path() && base_path != "")
-				path = base_path + "/" + path;
+				path = base_path.plus_file(path);
 			path = path.replace("///", "//").simplify_path();
 			if (path == self_path) {