asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #40714 from ThakeeNathees/Object-type-bug-fix

Browse source 
GDScript: "Object" datatype changed from BUILTIN to NATIVE
This commit is contained in:
Rémi Verschelde 2020-07-27 08:50:16 +02:00 committed by GitHub
commit 3e99059129
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/gdscript/gdscript_analyzer.cpp
View file

@ -342,6 +342,16 @@ GDScriptParser::DataType GDScriptAnalyzer::resolve_datatype(GDScriptParser::Type
return result;
}
if (first == "Object") {
result.kind = GDScriptParser::DataType::NATIVE;
result.native_type = "Object";
if (p_type->type_chain.size() > 1) {
push_error(R"("Object" type don't contain nested types.)", p_type->type_chain[1]);
return GDScriptParser::DataType();
}
return result;
}
if (GDScriptParser::get_builtin_type(first) < Variant::VARIANT_MAX) {
// Built-in types.
if (p_type->type_chain.size() > 1) {