diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-20 08:51:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 08:51:20 +0200 |
| commit | 18004399972db7918889e016004368bbc06a4d37 (patch) | |
| tree | 8fbb4bf0d710d4f8f461c91bfcdaf1d6b5ddc559 /editor | |
| parent | e20a28a7db090dbf39bc8c90487c3d7beb84cbb8 (diff) | |
| parent | edd93b76087de4c7483cebb14db9007d343d8842 (diff) | |
Merge pull request #22234 from DualMatrix/favorites_not_saved
Fixed favorite nodes list not being saved
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/create_dialog.cpp | 4 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index ff34618b04..eb11aea9cc 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -55,9 +55,9 @@ void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode) { while (!f->eof_reached()) { String l = f->get_line().strip_edges(); + String name = l.split(" ")[0]; - if (l != String()) { - + if (ClassDB::class_exists(name) || ScriptServer::is_global_class(name)) { TreeItem *ti = recent->create_item(root); ti->set_text(0, l); ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(l, base_type)); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 8637417598..1f5cd7fe0b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -2401,7 +2401,6 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel add_child(create_dialog); create_dialog->connect("create", this, "_create"); create_dialog->connect("favorites_updated", this, "_update_create_root_dialog"); - EditorFileSystem::get_singleton()->connect("script_classes_updated", create_dialog, "_save_and_update_favorite_list"); rename_dialog = memnew(RenameDialog(scene_tree, &editor_data->get_undo_redo())); add_child(rename_dialog); |