diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-14 08:26:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-14 08:26:08 +0100 |
| commit | dbbfade584ed5f1ecedd8ce78552e90df66a538d (patch) | |
| tree | c0e1cbd76b526981f7c6519c435e4e53f64e195b | |
| parent | 870ec61417d631d69db172e0774bc7b71530e224 (diff) | |
| parent | 017b7de2df4de8c477b144a00a6fed3104bd259a (diff) | |
Merge pull request #35082 from akien-mga/dont-count-yer-chicken
EditorNode: Delay addon init to NOTIFICATION_READY
| -rw-r--r-- | editor/editor_node.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 0ea8e04471..6ff00ba84b 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -369,6 +369,19 @@ void EditorNode::_notification(int p_what) { case NOTIFICATION_READY: { + { + _initializing_addons = true; + Vector<String> addons; + if (ProjectSettings::get_singleton()->has_setting("editor_plugins/enabled")) { + addons = ProjectSettings::get_singleton()->get("editor_plugins/enabled"); + } + + for (int i = 0; i < addons.size(); i++) { + set_addon_plugin_enabled(addons[i], true); + } + _initializing_addons = false; + } + VisualServer::get_singleton()->viewport_set_hide_scenario(get_scene_root()->get_viewport_rid(), true); VisualServer::get_singleton()->viewport_set_hide_canvas(get_scene_root()->get_viewport_rid(), true); VisualServer::get_singleton()->viewport_set_disable_environment(get_viewport()->get_viewport_rid(), true); @@ -6776,19 +6789,6 @@ EditorNode::EditorNode() { import_dock->initialize_import_options(); - { - _initializing_addons = true; - Vector<String> addons; - if (ProjectSettings::get_singleton()->has_setting("editor_plugins/enabled")) { - addons = ProjectSettings::get_singleton()->get("editor_plugins/enabled"); - } - - for (int i = 0; i < addons.size(); i++) { - set_addon_plugin_enabled(addons[i], true); - } - _initializing_addons = false; - } - FileAccess::set_file_close_fail_notify_callback(_file_access_close_error_notify); waiting_for_first_scan = true; |