summaryrefslogtreecommitdiffstats
path: root/scene/resources/theme.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources/theme.cpp')
-rw-r--r--scene/resources/theme.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index d57a0f6b38..5980d75b82 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -1613,6 +1613,17 @@ void Theme::merge_with(const Ref<Theme> &p_other) {
}
}
+ // Defaults.
+ if (p_other->has_default_font()) {
+ set_default_font(p_other->default_font);
+ }
+ if (p_other->has_default_font_size()) {
+ set_default_font_size(p_other->default_font_size);
+ }
+ if (p_other->has_default_base_scale()) {
+ set_default_base_scale(p_other->default_base_scale);
+ }
+
_unfreeze_and_propagate_changes();
}