diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-30 10:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 10:01:11 +0200 |
| commit | 432b25d3649319517827dbf7bc275e81e0a2b92e (patch) | |
| tree | d0ed3596d938caca1123f00497c11fe6b9026633 /core/string/ustring.cpp | |
| parent | 0b5d7281b9936f17176187338ef9706410a8fc75 (diff) | |
| parent | 10a56981dc7bf2d0f0decd56a005ea1c2986e279 (diff) | |
| download | redot-engine-432b25d3649319517827dbf7bc275e81e0a2b92e.tar.gz | |
Merge pull request #65066 from aaronfranke/str-path-join
Diffstat (limited to 'core/string/ustring.cpp')
| -rw-r--r-- | core/string/ustring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 0c43ba9ccc..ed3d4b0b54 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -4451,7 +4451,7 @@ String String::get_extension() const { return substr(pos + 1, length()); } -String String::plus_file(const String &p_file) const { +String String::path_join(const String &p_file) const { if (is_empty()) { return p_file; } |