From 18aafb6fc7ef80f3b0f7931bd84d1083da12915a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 5 Oct 2023 11:35:52 +0200 Subject: [PATCH] Fix regression from #1312 when passing structure from C++ to C# thunk as already boxed value --- Source/Engine/Engine/NativeInterop.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Engine/NativeInterop.cs b/Source/Engine/Engine/NativeInterop.cs index 500636290..f3bb57665 100644 --- a/Source/Engine/Engine/NativeInterop.cs +++ b/Source/Engine/Engine/NativeInterop.cs @@ -685,8 +685,10 @@ namespace FlaxEngine.Interop T value = default; if (nativePtr == IntPtr.Zero) return value; - - MarshalHelper.ToManaged(ref value, nativePtr, false); + if (typeof(T).IsValueType) + value = (T)ManagedHandle.FromIntPtr(nativePtr).Target; + else + MarshalHelper.ToManaged(ref value, nativePtr, false); return value; }