diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-11 15:58:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 15:58:16 +0200 |
| commit | 6b0183ec893ddea3f8ae71005b5fce1ae988e8a0 (patch) | |
| tree | 762ec5df42c374a18bb5ad0ee4cd213ba0add257 /editor/import | |
| parent | 6107d9e180a51e3c9feb4fe8c818321c292ff86b (diff) | |
| parent | 5ea1c75d639b53ef1fe84ef33bb65a844f6741b6 (diff) | |
Merge pull request #49279 from Calinou/rename-string-is-abs-path-method
Rename `String.is_abs_path()` to `String.is_absolute_path()`
Diffstat (limited to 'editor/import')
| -rw-r--r-- | editor/import/resource_importer_obj.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index dd62c72d8a..e932ac778c 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -126,7 +126,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Stand String p = l.replace("map_Kd", "").replace("\\", "/").strip_edges(); String path; - if (p.is_abs_path()) { + if (p.is_absolute_path()) { path = p; } else { path = base_path.plus_file(p); @@ -146,7 +146,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Stand String p = l.replace("map_Ks", "").replace("\\", "/").strip_edges(); String path; - if (p.is_abs_path()) { + if (p.is_absolute_path()) { path = p; } else { path = base_path.plus_file(p); @@ -166,7 +166,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Stand String p = l.replace("map_Ns", "").replace("\\", "/").strip_edges(); String path; - if (p.is_abs_path()) { + if (p.is_absolute_path()) { path = p; } else { path = base_path.plus_file(p); |