northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95184 from jsjtxietian/shader-include-relative

Browse Source 
Fix `String::simplify_path` handling of relative paths to parent dir (`../`), fixes relative shader includes
This commit is contained in:
Rémi Verschelde
2024-08-17 00:46:11 +02:00
parent 01b87a9a9c 6cf9af2817
commit 49e5fbfbd2
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/string/ustring.cpp
View File

@ -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;