asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show theme values from default theme always, fixes #16011, fixes #13071

Browse source
This commit is contained in:
Juan Linietsky 2018-11-14 18:02:21 +01:00
parent 7c00f0599e
commit 88bfb27abf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/gui/control.cpp
View file

@ -328,13 +328,14 @@ bool Control::_get(const StringName &p_name, Variant &r_ret) const {
}
void Control::_get_property_list(List<PropertyInfo> *p_list) const {
Ref<Theme> theme;
Ref<Theme> theme = Theme::get_default();
/* Using the default theme since the properties below are meant for editor only
if (data.theme.is_valid()) {
theme = data.theme;
} else {
theme = Theme::get_default();
}
}*/
{
List<StringName> names;