diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
tree | 8070f7807ec5d6a375df7184b151abbee8790608 /scene/resources/theme.cpp | |
parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'scene/resources/theme.cpp')
-rw-r--r-- | scene/resources/theme.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 20405a57b2..8d0aedbf93 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -374,7 +374,7 @@ void Theme::get_stylebox_types(List<StringName> *p_list) const { const StringName *key=NULL; while((key=style_map.next(key))) { p_list->push_back(*key); - } + } } void Theme::set_font(const StringName& p_name,const StringName& p_type,const Ref<Font>& p_font) { |