summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript_parser.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-01 12:06:35 +0200
committerGitHub <noreply@github.com>2019-07-01 12:06:35 +0200
commitd17eac735cc84abd9afd1e083df1a4e8a2c8e656 (patch)
treed006c3a5457edbde9e4f9016b48d0968d70e3ce5 /modules/gdscript/gdscript_parser.cpp
parentb62041d1f3b6428974d5be7ad9d378a445d432ac (diff)
parentd2833d4f4d891b6a0ee32a04f9d32a410b998b93 (diff)
downloadredot-engine-d17eac735cc84abd9afd1e083df1a4e8a2c8e656.tar.gz
Merge pull request #29815 from NilsIrl/plus_file_1
Replace ` + "/" + ` with `String::file_add()`
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
-rw-r--r--modules/gdscript/gdscript_parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index a4a27c39d7..9ab86a5459 100644
--- 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) {