From 14ffd0aa08659d9eb73cdff5278deafb9ca0e22c Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 17 Aug 2023 16:10:07 +0200
Subject: [PATCH] Add Variant new value init for objects

---
 Source/Engine/Core/Types/Variant.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Core/Types/Variant.cpp b/Source/Engine/Core/Types/Variant.cpp
index 0012913a3..8c5c37628 100644
--- a/Source/Engine/Core/Types/Variant.cpp
+++ b/Source/Engine/Core/Types/Variant.cpp
@@ -1075,9 +1075,7 @@ Variant& Variant::operator=(const Variant& other)
     case VariantType::Object:
         AsObject = other.AsObject;
         if (other.AsObject)
-        {
             AsObject->Deleted.Bind<Variant, &Variant::OnObjectDeleted>(this);
-        }
         break;
     case VariantType::Asset:
         AsAsset = other.AsAsset;
@@ -2925,8 +2923,10 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
         switch (type.Type)
         {
         case ScriptingTypes::Script:
-        case ScriptingTypes::Class:
             v.SetType(VariantType(VariantType::Object, typeName));
+            v.AsObject = type.Script.Spawn(ScriptingObjectSpawnParams(Guid::New(), typeHandle));
+            if (v.AsObject)
+                v.AsObject->Deleted.Bind<Variant, &Variant::OnObjectDeleted>(&v);
             break;
         case ScriptingTypes::Structure:
             v.SetType(VariantType(VariantType::Structure, typeName));
@@ -2935,6 +2935,9 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
             v.SetType(VariantType(VariantType::Enum, typeName));
             v.AsUint64 = 0;
             break;
+        default:
+            LOG(Error, "Unsupported scripting type '{}' for Variant", typeName.ToString());
+            break;
         }
     }
 #if USE_CSHARP
@@ -2953,6 +2956,15 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
         else
         {
             v.SetType(VariantType(VariantType::ManagedObject, typeName));
+            MObject* instance = mclass->CreateInstance();
+            if (instance)
+            {
+#if USE_NETCORE
+                v.AsUint64 = MCore::GCHandle::New(instance);
+#else
+                v.AsUint = MCore::GCHandle::New(instance);
+#endif
+            }
         }
     }
 #endif