godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37318 from ttencate/fix/argument_nulled_37312 

Revert "Allow parameters passed to GDScript functions to be nulled"
This commit is contained in:
Rémi Verschelde 2020-04-22 16:09:28 +02:00 committed by GitHub
parent f989a43135 23a8a8c667
commit 6aac75afc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/gdscript_function.cpp
View File

@ -337,16 +337,11 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
} }
if (!argument_types[i].is_type(*p_args[i], true)) { if (!argument_types[i].is_type(*p_args[i], true)) {
if (argument_types[i].is_type(Variant(), true)) {
memnew_placement(&stack[i], Variant);
continue;
} else {
r_err.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_err.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_err.argument = i; r_err.argument = i;
r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT; r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT;
return Variant(); return Variant();
} }
}
if (argument_types[i].kind == GDScriptDataType::BUILTIN) { if (argument_types[i].kind == GDScriptDataType::BUILTIN) {
Variant arg = Variant::construct(argument_types[i].builtin_type, &p_args[i], 1, r_err); Variant arg = Variant::construct(argument_types[i].builtin_type, &p_args[i], 1, r_err);
memnew_placement(&stack[i], Variant(arg)); memnew_placement(&stack[i], Variant(arg));