summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2016-11-14 08:36:01 +0900
committervolzhs <volzhs@gmail.com>2016-11-14 08:36:01 +0900
commitb0cf201ea3beb473fd0498c5c7ec3b98feda88b9 (patch)
treee420aba69e199c96826577420b6f071b1d13546f /tools/editor
parentc93c2a6be8ad0abbfd5cae4831ff2ce2200ae6f6 (diff)
Fix crash when select target path on import 3d scene window
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/editor_dir_dialog.cpp2
-rw-r--r--tools/editor/io_plugins/editor_scene_import_plugin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp
index cf0732501e..a6a6e11142 100644
--- a/tools/editor/editor_dir_dialog.cpp
+++ b/tools/editor/editor_dir_dialog.cpp
@@ -145,7 +145,7 @@ void EditorDirDialog::set_current_path(const String& p_path) {
if (p.begins_with("res://"))
p = p.replace_first("res://","");
- Vector<String> dirs = p.split("/");
+ Vector<String> dirs = p.split("/",false);
TreeItem *r=tree->get_root();
for(int i=0;i<dirs.size();i++) {
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index cb8ec6d0bc..093f37fe00 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -894,9 +894,9 @@ void EditorSceneImportDialog::_browse() {
void EditorSceneImportDialog::_browse_target() {
+ save_select->popup_centered_ratio();
if (save_path->get_text()!="")
save_select->set_current_path(save_path->get_text());
- save_select->popup_centered_ratio();
}