Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 21:52:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10555 from Rubonnek/removed-unnecessary-returns-and-breaks

Browse Source 
Removed unnecessary returns and break statements

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-08-23 00:06:29 +02:00 committed by GitHub
commit bc3c9a3c2a
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/tests/test_shader_lang.cpp
View File

@ -56,8 +56,6 @@ static String _mktab(int p_level) {
static String _typestr(SL::DataType p_type) {
return ShaderLanguage::get_datatype_name(p_type);
return "";
}
static String _prestr(SL::DataPrecision p_pres) {

3
modules/gdscript/gd_function.h
View File

@ -210,8 +210,9 @@ public:
#ifdef TOOLS_ENABLED
ERR_FAIL_INDEX_V(p_idx, arg_names.size(), StringName());
return arg_names[p_idx];
#endif
#else
return StringName();
#endif
}
Variant get_default_argument(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, default_arguments.size(), Variant());

3
modules/gdscript/gd_script.cpp
View File

@ -559,8 +559,9 @@ bool GDScript::_update_exports() {
return changed;
#endif
#else
return false;
#endif
}
void GDScript::update_exports() {

1
modules/visual_script/visual_script_expression.cpp
View File

@ -585,7 +585,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
r_token.type = TK_BASIC_TYPE;
r_token.value = i;
return OK;
break;
}
}

1
platform/android/godot_android.cpp
View File

@ -833,7 +833,6 @@ void android_main(struct android_app *app) {
if (engine.requested_quit) {
engine_term_display(&engine);
exit(0);
return;
}
// LOGI("end\n");

2
scene/gui/control.cpp
View File

@ -1839,8 +1839,6 @@ Control *Control::find_prev_valid_focus() const {
}
return NULL;
return NULL;
}
Control::FocusMode Control::get_focus_mode() const {