diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-30 12:52:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 12:52:04 +0200 |
| commit | bb409efa1cdcf314c3c0ece2a957b750869e4b09 (patch) | |
| tree | bc001ca046d5a18db86d7c07e598ae4962dfec3d | |
| parent | aceaf3953d5c251de75326058d23e44c6d116c7f (diff) | |
| parent | 364416ecd86da763ccb5481b546a95933b43d522 (diff) | |
Merge pull request #50016 from fire/gdscript-shadow
Remove singleton variable shadowing.
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index b149828a2f..c1a7bedbc8 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -3038,9 +3038,9 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co if (!is_function) { // Guess in autoloads as singletons. if (ProjectSettings::get_singleton()->has_autoload(p_symbol)) { - const ProjectSettings::AutoloadInfo &singleton = ProjectSettings::get_singleton()->get_autoload(p_symbol); - if (singleton.is_singleton) { - String script = singleton.path; + const ProjectSettings::AutoloadInfo &autoload = ProjectSettings::get_singleton()->get_autoload(p_symbol); + if (autoload.is_singleton) { + String script = autoload.path; if (!script.ends_with(".gd")) { // Not a script, try find the script anyway, // may have some success. |