瀏覽代碼

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

Rémi Verschelde 3 年之前
父節點
當前提交
b3d208385f
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      modules/gdscript/gdscript_vm.cpp

+ 6 - 1
modules/gdscript/gdscript_vm.cpp

@@ -488,7 +488,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				memnew_placement(&stack[i + 3], Variant(*p_args[i]));
 				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)) {
 				r_err.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_err.argument = i;