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

Fixed Null appearing inside export variables with type hints and no default value

Browse source 
The default value of the type is now used to initialise it.

export(int) A

Will now have A be 0 istead of Null even though it still showed as 0 before in the inspector, fixes #25357
This commit is contained in:
DualMatrix 2019-02-01 17:09:41 +01:00
parent 70689ebffd
commit ff508dfede
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

@ -4720,6 +4720,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) {