diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-30 20:45:45 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 20:45:45 -0300 |
| commit | bcd73fc00a913babb501dd119d3d833aceaf88da (patch) | |
| tree | f5213fab100f72bbfecba792e0b05b72c2ddd2da /core/io/resource_format_binary.cpp | |
| parent | d085b2d04d6a6f972cc252532dbbf07f0d54fc3c (diff) | |
| parent | d11c1afc0497894edd8307434948fc8fb4bb1b11 (diff) | |
| download | redot-engine-bcd73fc00a913babb501dd119d3d833aceaf88da.tar.gz | |
Merge pull request #52240 from Rubonnek/rename-rel-path
Rename `String::is_rel_path` to `String::is_relative_path`
Diffstat (limited to 'core/io/resource_format_binary.cpp')
| -rw-r--r-- | core/io/resource_format_binary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 00d4d093da..84fd6496a7 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -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)); } |