diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-23 15:22:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 15:22:16 +0200 |
| commit | 1968f0129c12b1ae1085b8b57d16b2dd7cea34f4 (patch) | |
| tree | ee6555e7707f9d30c4ea4216e51b282f2f75156d /editor/editor_node.cpp | |
| parent | 8c3a5057c54230677b864c0cb157a249f8825f62 (diff) | |
| parent | ab1e809426d2a301193ef5d67c38cd9560670080 (diff) | |
| download | redot-engine-1968f0129c12b1ae1085b8b57d16b2dd7cea34f4.tar.gz | |
Merge pull request #33001 from Faless/js/http_run_server
Implement HTTP server for HTML5 "run" export
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6e2a4810cd..9c377a6b1c 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -371,7 +371,7 @@ void EditorNode::_notification(int p_what) { case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { scene_tabs->set_tab_close_display_policy((bool(EDITOR_GET("interface/scene_tabs/always_show_close_button")) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY)); - Ref<Theme> theme = create_editor_theme(theme_base->get_theme()); + theme = create_editor_theme(theme_base->get_theme()); theme_base->set_theme(theme); gui_base->set_theme(theme); @@ -5640,6 +5640,9 @@ EditorNode::EditorNode() { editor_export = memnew(EditorExport); add_child(editor_export); + // Exporters might need the theme + theme = create_custom_theme(); + register_exporters(); GLOBAL_DEF("editor/main_run_args", ""); @@ -5681,7 +5684,6 @@ EditorNode::EditorNode() { theme_base->add_child(gui_base); gui_base->set_anchors_and_margins_preset(Control::PRESET_WIDE); - Ref<Theme> theme = create_custom_theme(); theme_base->set_theme(theme); gui_base->set_theme(theme); gui_base->add_style_override("panel", gui_base->get_stylebox("Background", "EditorStyles")); |