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

Rename String::is_rel_path to String::is_relative_path

Browse source
This commit is contained in:
Wilson E. Alvarez 2021-08-29 19:43:47 -04:00
parent 838a449d64
commit d11c1afc04
No known key found for this signature in database
GPG key ID: A32174A3D2ED3F9E
23 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/io/resource_format_binary.cpp
View file

@ -335,7 +335,7 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
String exttype = get_unicode_string();
String path = get_unicode_string();
if (path.find("://") == -1 && path.is_rel_path()) {
if (path.find("://") == -1 && path.is_relative_path()) {
// path is relative to file being loaded, so convert to a resource path
path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
}
@ -626,7 +626,7 @@ Error ResourceLoaderBinary::load() {
path = remaps[path];
}
if (path.find("://") == -1 && path.is_rel_path()) {
if (path.find("://") == -1 && path.is_relative_path()) {
// path is relative to file being loaded, so convert to a resource path
path = ProjectSettings::get_singleton()->localize_path(path.get_base_dir().plus_file(external_resources[i].path));
}