From b2a14042d52b45ae0554f4146c700b18f50ee92f Mon Sep 17 00:00:00 2001 From: Catchawink Date: Sat, 14 Dec 2019 05:06:29 -0500 Subject: Fixed issues with using a relative path in the export window. 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. --- core/ustring.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/ustring.cpp b/core/ustring.cpp index 6a1dc2295f..345db0eb13 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3792,7 +3792,8 @@ bool String::is_valid_float() 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 rel = src.path_to(dst); if (rel == dst) // failed -- cgit v1.2.3