godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59979 from bruvzg/cpp_check2

Browse Source
This commit is contained in:
Rémi Verschelde
2022-04-27 10:08:26 +02:00
committed by GitHub
parent f8cfff2aa6 de4c97758a
commit 8dfa12cae7
63 changed files with 261 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/string/ustring.cpp
View File

@@ -4124,15 +4124,11 @@ String String::path_to(const String &p_path) const {
dst += "/";
}
String base;
if (src.begins_with("res://") && dst.begins_with("res://")) {
base = "res:/";
src = src.replace("res://", "/");
dst = dst.replace("res://", "/");
} else if (src.begins_with("user://") && dst.begins_with("user://")) {
base = "user:/";
src = src.replace("user://", "/");
dst = dst.replace("user://", "/");
@@ -4147,7 +4143,6 @@ String String::path_to(const String &p_path) const {
return p_path; //impossible to do this
}
base = src_begin;
src = src.substr(src_begin.length(), src.length());
dst = dst.substr(dst_begin.length(), dst.length());
}