Merge pull request #1 from FlaxEngine/master

Keep up with main
2023-12-01 18:06:42 +08:00
parent 3c5035d3e9 712c400e43
commit 7b63c7016c
11 changed files with 43 additions and 13 deletions
--- a/Source/Engine/Scripting/ManagedCLR/MUtils.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MUtils.cpp
@@ -1209,9 +1209,20 @@ void* MUtils::VariantToManagedArgPtr(Variant& value, MType* type, bool& failed)
        return object;
    }
    case MTypes::Ptr:
-        if (value.Type.Type == VariantType::Null)
+        switch (value.Type.Type)
+        {
+        case VariantType::Pointer:
+            return &value.AsPointer;
+        case VariantType::Object:
+            return &value.AsObject;
+        case VariantType::Asset:
+            return &value.AsAsset;
+        case VariantType::Structure:
+        case VariantType::Blob:
+            return &value.AsBlob.Data;
+        default:
            return nullptr;
-        return (void*)value;
+        }
    default:
        break;
    }