Merge pull request #29815 from NilsIrl/plus_file_1

Replace ` + "/" + ` with `String::file_add()`
This commit is contained in:
Rémi Verschelde 2019-07-01 12:06:35 +02:00 committed by GitHub
commit d17eac735c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 39 additions and 39 deletions

View file

@ -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) {