diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-28 23:03:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 23:03:10 +0100 |
| commit | a1cbe8e22bec516b138436d06282046466e89c79 (patch) | |
| tree | 24c8d7757a3f1d9e3543a8eff1363f0f7943cbc6 /scene/gui/control.cpp | |
| parent | c5df3d4d8d3d6ee74b0dad5eeb45f318c8b205a9 (diff) | |
| parent | f50488a36188d5975bfa8554687a1acdd394d6a9 (diff) | |
Merge pull request #7878 from RebelliousX/else
Bunch of missing `else` statements and general logic
Diffstat (limited to 'scene/gui/control.cpp')
| -rw-r--r-- | scene/gui/control.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index cffe2ce218..4161725ad5 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2421,8 +2421,6 @@ void Control::get_argument_options(const StringName& p_function,int p_idx,List<S Theme::get_default()->get_font_list(get_class(),&sn); } else if (pf=="add_constant_override" || pf=="has_constant" || pf=="has_constant_override" || pf=="get_constant") { Theme::get_default()->get_constant_list(get_class(),&sn); - } else if (pf=="add_color_override" || pf=="has_color" || pf=="has_color_override" || pf=="get_color") { - Theme::get_default()->get_color_list(get_class(),&sn); } sn.sort_custom<StringName::AlphCompare>(); |