Merge pull request #15186 from GodotExplorer/default-theme

Fix errors with custom theme and custom font in project settings.
This commit is contained in:
Rémi Verschelde 2018-01-04 14:50:15 +01:00 committed by GitHub
commit dc2cc6bc2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 38 deletions

View file

@ -66,7 +66,9 @@ void EditorLog::_notification(int p_what) {
Ref<DynamicFont> df_output_code = get_font("output_source", "EditorFonts");
if (df_output_code.is_valid()) {
df_output_code->set_size(int(EDITOR_DEF("run/output/font_size", 13)) * EDSCALE);
log->add_font_override("normal_font", get_font("output_source", "EditorFonts"));
if (log != NULL) {
log->add_font_override("normal_font", get_font("output_source", "EditorFonts"));
}
}
}