diff options
| author | Juan Linietsky | 2015-12-15 23:40:29 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-15 23:40:29 -0300 |
| commit | 686c65a354535366ff22718b974e9dd0d25dbfdd (patch) | |
| tree | cdffcb81d7e96333b04c6dd940de201b3ebf877f /tools/editor/editor_node.cpp | |
| parent | a1142225bf513e4afe0527ca604486d3988449cc (diff) | |
| parent | 08cab3a17a4eba874c17cec41425f149846663a4 (diff) | |
| download | godot-686c65a354535366ff22718b974e9dd0d25dbfdd.tar.gz godot-686c65a354535366ff22718b974e9dd0d25dbfdd.tar.zst godot-686c65a354535366ff22718b974e9dd0d25dbfdd.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 4b4fd01ee..6352a235f 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4766,6 +4766,7 @@ EditorNode::EditorNode() { ResourceLoader::set_abort_on_missing_resources(false); FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); + EditorFileDialog::set_default_display_mode((EditorFileDialog::DisplayMode)EditorSettings::get_singleton()->get("file_dialog/display_mode").operator int()); ResourceLoader::set_error_notify_func(this,_load_error_notify); ResourceLoader::set_dependency_error_notify_func(this,_dependency_error_report); @@ -5612,6 +5613,7 @@ EditorNode::EditorNode() { scenes_dock = memnew( ScenesDock(this) ); scenes_dock->set_name("FileSystem"); + scenes_dock->set_use_thumbnails(int(EditorSettings::get_singleton()->get("file_dialog/display_mode"))==EditorFileDialog::DISPLAY_THUMBNAILS); dock_slot[DOCK_SLOT_LEFT_BR]->add_child(scenes_dock); //prop_pallete->add_child(scenes_dock); scenes_dock->connect("open",this,"open_request"); |