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

Fix unboxing of array type Variants

Browse Source
This commit is contained in:
Ari Vuollet
2024-05-05 13:15:31 +03:00
parent 9d830eb1e2
commit e77ae12b9b
8 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Scripting/ManagedCLR/MCore.h
View File

@@ -83,6 +83,7 @@ public:
{
static MArray* New(const MClass* elementKlass, int32 length);
static MClass* GetClass(MClass* elementKlass);
static MClass* GetArrayClass(const MArray* obj);
static int32 GetLength(const MArray* obj);
static void* GetAddress(const MArray* obj);
static MArray* Unbox(MObject* obj);

5
Source/Engine/Scripting/ManagedCLR/MUtils.cpp
View File

@@ -394,14 +394,15 @@ Variant MUtils::UnboxVariant(MObject* value)
case MTypes::Array:
{
void* ptr = MCore::Array::GetAddress((MArray*)value);
MClass* elementClass = klass->GetElementClass();
const MClass* arrayClass = klass == stdTypes.ManagedArrayClass ? MCore::Array::GetArrayClass((MArray*)value) : klass;
const MClass* elementClass = arrayClass->GetElementClass();
if (elementClass == MCore::TypeCache::Byte)
{
Variant v;
v.SetBlob(ptr, MCore::Array::GetLength((MArray*)value));
return v;
}
const StringAnsiView fullname = klass->GetFullName();
const StringAnsiView fullname = arrayClass->GetFullName();
Variant v;
v.SetType(MoveTemp(VariantType(VariantType::Array, fullname)));
auto& array = v.AsArray();