diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-30 09:23:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 09:23:33 +0200 |
| commit | 4b377540c76f6a489b7e1bd937f73050fd0d6209 (patch) | |
| tree | 4d465cd6a5ae5ad9c042b430def2bf881a91d2e3 | |
| parent | 1fca76a8527f6051d58043675f493b2c44cb8c34 (diff) | |
| parent | 1fad0522d041da7a477310bd8eb9cf4bd0156851 (diff) | |
Merge pull request #63664 from heppocogne/Fix-convert3to4-path-handling-issue
Fix a path handling issue of ProjectConverter3To4
| -rw-r--r-- | editor/project_converter_3_to_4.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp index 97013da05e..658258d98b 100644 --- a/editor/project_converter_3_to_4.cpp +++ b/editor/project_converter_3_to_4.cpp @@ -1898,14 +1898,14 @@ Vector<String> ProjectConverter3To4::check_for_files() { continue; } if (dir.current_is_dir()) { - directories_to_check.append(current_dir + file_name + "/"); + directories_to_check.append(current_dir.plus_file(file_name) + "/"); } else { bool proper_extension = false; if (file_name.ends_with(".gd") || file_name.ends_with(".shader") || file_name.ends_with(".tscn") || file_name.ends_with(".tres") || file_name.ends_with(".godot") || file_name.ends_with(".cs") || file_name.ends_with(".csproj")) proper_extension = true; if (proper_extension) { - collected_files.append(current_dir + file_name); + collected_files.append(current_dir.plus_file(file_name)); } } file_name = dir.get_next(); |