diff options
| author | Daniel J. Ramirez <djrmuv@gmail.com> | 2017-11-09 20:45:18 -0600 |
|---|---|---|
| committer | Daniel J. Ramirez <djrmuv@gmail.com> | 2017-11-09 20:45:18 -0600 |
| commit | 12251a3a15f537e6102a9ffe9a02a1b930d48e99 (patch) | |
| tree | 386f1075debae0636306cb1c7b0dc32ae1ad2ee8 | |
| parent | 01512efbe62dcf8d5f5ca5c070557f227f988f47 (diff) | |
Fix theme with custom font.
| -rw-r--r-- | editor/editor_fonts.cpp | 5 | ||||
| -rw-r--r-- | editor/editor_themes.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 360c3e4161..7e20077fd6 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -180,9 +180,4 @@ void editor_register_fonts(Ref<Theme> p_theme) { df_output_code->set_font_data(dfmono); MAKE_FALLBACKS(df_output_code); p_theme->set_font("status_source", "EditorFonts", df_output_code); - - //replace default theme - Ref<Texture> di; - Ref<StyleBox> ds; - fill_default_theme(p_theme, df, df_doc, di, ds, EDSCALE); } diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 220ee2b28f..de0c3f55cc 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -1045,7 +1045,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { } Ref<Theme> create_custom_theme() { - Ref<Theme> theme; + Ref<Theme> theme = create_editor_theme(); String custom_theme = EditorSettings::get_singleton()->get("interface/theme/custom_theme"); if (custom_theme != "") { |