浏览代码

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

GDScript: "Object" datatype changed from BUILTIN to NATIVE
Rémi Verschelde 5 年之前
父节点
当前提交
3e99059129
共有 1 个文件被更改,包括 10 次插入0 次删除
  1. 10 0
      modules/gdscript/gdscript_analyzer.cpp

+ 10 - 0
modules/gdscript/gdscript_analyzer.cpp

@@ -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) {