godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Rename String plus_file to path_join

Browse Source
This commit is contained in:
Aaron Franke
2022-08-29 19:34:01 -05:00
parent 051f24b067
commit 10a56981dc
100 changed files with 519 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/export/editor_export_plugin.cpp
View File

@@ -181,7 +181,7 @@ void EditorExportTextSceneToBinaryPlugin::_export_file(const String &p_path, con
if (!convert) {
return;
}
String tmp_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpfile.res");
String tmp_path = EditorPaths::get_singleton()->get_cache_dir().path_join("tmpfile.res");
Error err = ResourceFormatLoaderText::convert_file_to_binary(p_path, tmp_path);
if (err != OK) {
DirAccess::remove_file_or_error(tmp_path);