maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #25550 from DualMatrix/fix-25357

Browse source 
Fixed Null appearing inside export variables with type hints and no default value
This commit is contained in:
Rémi Verschelde 2019-02-12 12:01:22 +01:00 committed by GitHub
parent 279bfb3503 ff508dfede
commit e40395669c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/gdscript/gdscript_parser.cpp
View file

@ -4724,6 +4724,25 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
_set_error("Type-less export needs a constant expression assigned to infer type.");
return;
}
if (member._export.type != Variant::NIL) {
IdentifierNode *id = alloc_node<IdentifierNode>();
id->name = member.identifier;
ConstantNode *cn = alloc_node<ConstantNode>();
Variant::CallError ce;
cn->value = Variant::construct(member._export.type, NULL, 0, ce);
OperatorNode *op = alloc_node<OperatorNode>();
op->op = OperatorNode::OP_INIT_ASSIGN;
op->arguments.push_back(id);
op->arguments.push_back(cn);
p_class->initializer->statements.push_back(op);
member.initial_assignment = op;
}
}
if (autoexport && member.data_type.has_type) {