diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-04-24 11:04:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 11:04:16 +0200 |
commit | d7578792ca75571cedbf6f4cf98315ec3141e1b6 (patch) | |
tree | 3e35f189cac469fb81b7450827c3f7037d12792b /editor | |
parent | 4c147008f33773bb385c6a67b1a7394ddbef6126 (diff) | |
parent | 515f92d03b6bb4e8a42d5b88d603c96c69d233a4 (diff) |
Merge pull request #8496 from akien-mga/stdout-cleanup
Fix property warnings and hide some debug prints
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_node.cpp | 7 | ||||
-rw-r--r-- | editor/editor_settings.cpp | 4 | ||||
-rw-r--r-- | editor/project_manager.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index cc7ee44902..04d369fed4 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -435,7 +435,7 @@ void EditorNode::_sources_changed(bool p_exist) { if (defer_load_scene != "") { - print_line("loading scene DEFERED"); + print_line("loading scene DEFERRED"); load_scene(defer_load_scene); defer_load_scene = ""; } @@ -6051,7 +6051,10 @@ EditorNode::EditorNode() { { _initializing_addons = true; - Vector<String> addons = GlobalConfig::get_singleton()->get("editor_plugins/enabled"); + Vector<String> addons; + if (GlobalConfig::get_singleton()->has("editor_plugins/enabled")) { + addons = GlobalConfig::get_singleton()->get("editor_plugins/enabled"); + } for (int i = 0; i < addons.size(); i++) { set_addon_plugin_enabled(addons[i], true); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 35373eb815..bec4fdadc7 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -407,7 +407,7 @@ void EditorSettings::setup_network() { IP::get_singleton()->get_local_addresses(&local_ip); String lip; String hint; - String current = get("network/debug_host"); + String current = has("network/debug_host") ? get("network/debug_host") : ""; for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) { @@ -591,9 +591,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("editors/2d/bone_color2", Color(0.75, 0.75, 0.75, 0.9)); set("editors/2d/bone_selected_color", Color(0.9, 0.45, 0.45, 0.9)); set("editors/2d/bone_ik_color", Color(0.9, 0.9, 0.45, 0.9)); - set("editors/2d/keep_margins_when_changing_anchors", false); - set("editors/2d/warped_mouse_panning", true); set("run/window_placement/rect", 0); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 3bdc742354..1a4a36fa18 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1211,7 +1211,7 @@ ProjectManager::ProjectManager() { } } - FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesytem/file_dialog/show_hidden_files")); + FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files")); set_area_as_parent_rect(); set_theme(create_editor_theme()); |