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 /scene/resources | |
| parent | d085b2d04d6a6f972cc252532dbbf07f0d54fc3c (diff) | |
| parent | d11c1afc0497894edd8307434948fc8fb4bb1b11 (diff) | |
Merge pull request #52240 from Rubonnek/rename-rel-path
Rename `String::is_rel_path` to `String::is_relative_path`
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/resource_format_text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index dbe118a262..b863a309c0 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -424,7 +424,7 @@ Error ResourceLoaderText::load() { } } - 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(local_path.get_base_dir().plus_file(path)); } @@ -768,7 +768,7 @@ void ResourceLoaderText::get_dependencies(FileAccess *p_f, List<String> *p_depen } } - if (!using_uid && path.find("://") == -1 && path.is_rel_path()) { + if (!using_uid && 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(local_path.get_base_dir().plus_file(path)); } |