godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Fixed issues with using a relative path in the export window.

Browse Source 
Before this fix, opening relative export paths inside of an EditorFileDialog was not possible. This was fixed by modifying String::path_to_file() to save relative paths in EditorExportPreset::set_export_path() more appropriately and changing EditorFileDialog::set_current_dir() to open relative paths.
This commit is contained in:
Catchawink
2019-12-14 05:06:29 -05:00
committed by Catchawink
parent 3a9284b562
commit b2a14042d5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/ustring.cpp
View File

@@ -3792,7 +3792,8 @@ bool String::is_valid_float() const {
String String::path_to_file(const String &p_path) const { String String::path_to_file(const String &p_path) const {
String src = this->replace("\\", "/").get_base_dir(); // Don't get base dir for src, this is expected to be a dir already.
String src = this->replace("\\", "/");
String dst = p_path.replace("\\", "/").get_base_dir(); String dst = p_path.replace("\\", "/").get_base_dir();
String rel = src.path_to(dst); String rel = src.path_to(dst);
if (rel == dst) // failed if (rel == dst) // failed

2
editor/editor_file_dialog.cpp
View File

@@ -958,6 +958,8 @@ String EditorFileDialog::get_current_path() const {
} }
void EditorFileDialog::set_current_dir(const String &p_dir) { void EditorFileDialog::set_current_dir(const String &p_dir) {
if (p_dir.is_rel_path())
dir_access->change_dir(OS::get_singleton()->get_resource_dir());
dir_access->change_dir(p_dir); dir_access->change_dir(p_dir);
update_dir(); update_dir();
invalidate(); invalidate();