Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

In merge_with also merge some default fileds of theme

Browse source
This commit is contained in:
jsjtxietian 2024-01-07 01:24:21 +08:00
parent 89cc635c05
commit 6f3568e3db
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scene/resources/theme.cpp
View file

@ -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();
}