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/editor_node.cpp | |
| 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/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 7 |
1 files changed, 5 insertions, 2 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); |