diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-15 02:01:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-15 02:02:41 -0300 |
| commit | 9afdb3e0ad5bfbdafe307212f5d4ebcc7c3ac852 (patch) | |
| tree | d25ef63dfe50d59987b4a611c1d1773185a3e35d /scene/gui | |
| parent | b0870e487c6cc68bb0a2cef7174f3f5697667a2e (diff) | |
-fixed bug in Button now exporting font property
-made GUI Theme editor usable
-editor does not allow to export or create .pck in the same path as a project
-changed .pck format (lacked support for versioning so couldn't change it), previous was causing crashes and is now incompatible, just re-export.
-will not look for .pck files recursively, was causing unexpected behaviors
-fixed execution of Godot in paths with non unicode characters in Windows, OSX and Linux.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 3e44b5af16..9b0c05b6a6 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1407,6 +1407,8 @@ Ref<Font> Control::get_font(const StringName& p_name,const StringName& p_type) c if (theme_owner->data.theme->has_font(p_name, type ) ) return data.theme_owner->data.theme->get_font(p_name, type ); + if (theme_owner->data.theme->get_default_theme_font().is_valid()) + return theme_owner->data.theme->get_default_theme_font(); Control *parent = theme_owner->get_parent()?theme_owner->get_parent()->cast_to<Control>():NULL; if (parent) |