diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-17 00:46:11 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-17 00:46:11 +0200 |
| commit | 49e5fbfbd2baba5528e2e2a9e6b404c2d9957624 (patch) | |
| tree | c481971e7e7212c87e9efc45968926eeec6ebea4 /core/string | |
| parent | 01b87a9a9c392062c239248d597a2b8d13a548eb (diff) | |
| parent | 6cf9af2817a9751bf3d677165bf8ceb85f4186f0 (diff) | |
| download | redot-engine-49e5fbfbd2baba5528e2e2a9e6b404c2d9957624.tar.gz | |
Merge pull request #95184 from jsjtxietian/shader-include-relative
Fix `String::simplify_path` handling of relative paths to parent dir (`../`), fixes relative shader includes
Diffstat (limited to 'core/string')
| -rw-r--r-- | core/string/ustring.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 5a1f6925aa..3aaaf46b06 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -4430,10 +4430,7 @@ String String::simplify_path() const { dirs.remove_at(i); i--; } else if (d == "..") { - if (i == 0) { - dirs.remove_at(i); - i--; - } else { + if (i != 0) { dirs.remove_at(i); dirs.remove_at(i - 1); i -= 2; |