Fix regression from #1312 when passing structure from C++ to C# thunk as already boxed value

2023-10-05 11:35:52 +02:00
parent 86d1d29820
commit 9af6048bec
1 changed files with 4 additions and 2 deletions
--- 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<T>.ToManaged(ref value, nativePtr, false);
+                if (typeof(T).IsValueType)
+                    value = (T)ManagedHandle.FromIntPtr(nativePtr).Target;
+                else
+                    MarshalHelper<T>.ToManaged(ref value, nativePtr, false);
                return value;
            }