Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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
commit 49e5fbfbd2
No known key found for this signature in database
GPG key ID: C3336907360768E1
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;