godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

Merge pull request #56409 from cdemirer/fix-unexpected-copying-when-parameter-is-typed

Browse Source
This commit is contained in:
Rémi Verschelde
2022-01-10 17:03:47 +01:00
committed by GitHub
parent eea510fc35 511e699fee
commit b3d208385f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdscript/gdscript_vm.cpp
View File

@@ -488,7 +488,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
memnew_placement(&stack[i + 3], Variant(*p_args[i])); memnew_placement(&stack[i + 3], Variant(*p_args[i]));
continue; continue;
} }
// If types already match, don't call Variant::construct(). Constructors of some types
// (e.g. packed arrays) do copies, whereas they pass by reference when inside a Variant.
if (argument_types[i].is_type(*p_args[i], false)) {
memnew_placement(&stack[i + 3], Variant(*p_args[i]));
continue;
}
if (!argument_types[i].is_type(*p_args[i], true)) { if (!argument_types[i].is_type(*p_args[i], true)) {
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;