Merge remote-tracking branch 'origin/master' into 1.7

2023-10-01 13:17:41 +02:00
parent a001a5fbdc 6d92d0b58f
commit dd21020297
58 changed files with 786 additions and 388 deletions
--- a/Source/Engine/Scripting/BinaryModule.cpp
+++ b/Source/Engine/Scripting/BinaryModule.cpp
@@ -1240,8 +1240,12 @@ bool ManagedBinaryModule::InvokeMethod(void* method, const Variant& instance, Sp
            return true;
        }

+#if USE_NETCORE
+        mInstance = instanceObject;
+#else
        // For value-types instance is the actual boxed object data, not te object itself
        mInstance = instanceObjectClass->IsValueType() ? MCore::Object::Unbox(instanceObject) : instanceObject;
+#endif
    }

    // Marshal parameters