GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix crash when boxing native array to managed value

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-11 15:06:26 +02:00
parent 1134cfa6a6
commit 48d4a51c1b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Scripting/ManagedCLR/MUtils.h
View File

@@ -3,6 +3,7 @@
#pragma once #pragma once
#include "MTypes.h" #include "MTypes.h"
#include "MClass.h"
#include "MCore.h" #include "MCore.h"
#include "Engine/Core/Types/StringView.h" #include "Engine/Core/Types/StringView.h"
#include "Engine/Core/Types/DataContainer.h" #include "Engine/Core/Types/DataContainer.h"
@@ -354,7 +355,7 @@ struct MConverter<Array<T>>
{ {
if (!klass) if (!klass)
return nullptr; return nullptr;
MArray* result = MCore::Array::New(klass, data.Count()); MArray* result = MCore::Array::New(klass->GetElementClass(), data.Count());
MConverter<T> converter; MConverter<T> converter;
converter.ToManagedArray(result, Span<T>(data.Get(), data.Count())); converter.ToManagedArray(result, Span<T>(data.Get(), data.Count()));
return (MObject*)result; return (MObject*)result;