summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-07-29 12:40:53 +0200
committerGitHub <noreply@github.com>2020-07-29 12:40:53 +0200
commit25c030b1c59d9123e8405de5c0f7ef9d16a4e6ad (patch)
tree893e9e266a333c05add1c92bc7f4f1a1fa0e5a30
parent3890638d84e39a7d5b3f4696f1ca069d34e33964 (diff)
parent68566b7bec5a23b43809666940531a58b0a5b6b6 (diff)
Merge pull request #40824 from lyuma/gdscript_get_member
GDScript: Fix crash caused by inconsistent get_member
-rw-r--r--modules/gdscript/gdscript_analyzer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 4098425518..597a79a40c 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -2019,7 +2019,7 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
GDScriptParser::ClassNode *outer = base_class->outer;
while (outer != nullptr) {
if (outer->has_member(name)) {
- const GDScriptParser::ClassNode::Member &member = base_class->get_member(name);
+ const GDScriptParser::ClassNode::Member &member = outer->get_member(name);
if (member.type == GDScriptParser::ClassNode::Member::CONSTANT) {
// TODO: Make sure loops won't cause problem. And make special error message for those.
// For out-of-order resolution: