Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 18:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #32100 from SaracenOne/gdscript_parent_const_types

Browse source 
Fix const deceleration for inherited scripts above immediate parent
This commit is contained in:
Rémi Verschelde 2019-09-19 20:11:37 +02:00 • committed by GitHub
commit 291f408fcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/gdscript/gdscript_parser.cpp
View file

@ -5757,10 +5757,11 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
} }
} }
// Still look for class constants in parent script // Still look for class constants in parent scripts
if (!found && (base_type.kind == DataType::GDSCRIPT || base_type.kind == DataType::SCRIPT)) { if (!found && (base_type.kind == DataType::GDSCRIPT || base_type.kind == DataType::SCRIPT)) {
Ref<Script> scr = base_type.script_type; Ref<Script> scr = base_type.script_type;
ERR_FAIL_COND_V(scr.is_null(), result); ERR_FAIL_COND_V(scr.is_null(), result);
while (scr.is_valid()) {
Map<StringName, Variant> constants; Map<StringName, Variant> constants;
scr->get_constants(&constants); scr->get_constants(&constants);
@ -5780,6 +5781,12 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
} }
} }
} }
if (found) {
break;
} else {
scr = scr->get_base_script();
}
}
} }
if (!found && !for_completion) { if (!found && !for_completion) {