Browse Source

Merge pull request #7111 from volzhs/crash-import-scene

Fix crash when select target path on import 3d scene window
Rémi Verschelde 8 years ago
parent
commit
bbc71083c1

+ 1 - 1
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++) {

+ 1 - 1
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();
 
 }