summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonerSound <mario.shadic.esteves@hotmail.com>2019-08-22 21:14:45 +0100
committerSonerSound <mario.shadic.esteves@hotmail.com>2019-08-22 22:20:15 +0100
commit326f8560060c0a7234d9f3057313546f91662ace (patch)
tree5e0da320679e674d39dd5df72b0358418330d671
parent584ca0f156cec64c259382895e105cf27566a987 (diff)
Export path is the only path to be saved as a relative path
Also reverts 90b2415343287f67586956c798d4b7a63544158f
-rw-r--r--editor/editor_export.cpp6
-rw-r--r--editor/editor_properties.cpp15
-rw-r--r--editor/project_export.cpp13
3 files changed, 9 insertions, 25 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp
index ed262d9c4f..7c42f9f56d 100644
--- a/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -147,6 +147,12 @@ String EditorExportPreset::get_include_filter() const {
void EditorExportPreset::set_export_path(const String &p_path) {
export_path = p_path;
+ /* NOTE(SonerSound): if there is a need to implement a PropertyHint that specifically indicates a relative path,
+ * this should be removed. */
+ if (export_path.is_abs_path()) {
+ String res_path = OS::get_singleton()->get_resource_dir();
+ export_path = res_path.path_to_file(export_path);
+ }
EditorExport::singleton->save_presets();
}
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index a8ef563368..659893a1b6 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -208,13 +208,7 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
void EditorPropertyPath::_path_selected(const String &p_path) {
- String final_path = p_path;
- if (final_path.is_abs_path()) {
- String res_path = OS::get_singleton()->get_resource_dir() + "/";
- final_path = res_path.path_to_file(final_path);
- }
-
- emit_changed(get_edited_property(), final_path);
+ emit_changed(get_edited_property(), p_path);
update_property();
}
void EditorPropertyPath::_path_pressed() {
@@ -227,13 +221,6 @@ void EditorPropertyPath::_path_pressed() {
}
String full_path = get_edited_object()->get(get_edited_property());
- if (full_path.is_rel_path()) {
-
- if (!DirAccess::exists(full_path.get_base_dir())) {
- DirAccessRef da(DirAccess::create(DirAccess::ACCESS_FILESYSTEM));
- da->make_dir_recursive(full_path.get_base_dir());
- }
- }
dialog->clear_filters();
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
index c78a81dbe0..956da92c35 100644
--- a/editor/project_export.cpp
+++ b/editor/project_export.cpp
@@ -931,17 +931,8 @@ void ProjectExportDialog::_export_project() {
export_project->add_filter("*." + extension_list[i] + " ; " + platform->get_name() + " Export");
}
- String current_preset_export_path = current->get_export_path();
-
- if (current_preset_export_path != "") {
-
- if (!DirAccess::exists(current_preset_export_path.get_base_dir())) {
-
- DirAccessRef da(DirAccess::create(DirAccess::ACCESS_FILESYSTEM));
- da->make_dir_recursive(current_preset_export_path.get_base_dir());
- }
-
- export_project->set_current_path(current_preset_export_path);
+ if (current->get_export_path() != "") {
+ export_project->set_current_path(current->get_export_path());
} else {
if (extension_list.size() >= 1) {
export_project->set_current_file(default_filename + "." + extension_list[0]);