Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Editor/Windows/Profiler/Memory.cs
This commit is contained in:
@@ -796,12 +796,8 @@ ScriptingObject* ManagedBinaryModule::ManagedObjectSpawn(const ScriptingObjectSp
|
||||
// Mark as managed type
|
||||
object->Flags |= ObjectFlags::IsManagedType;
|
||||
|
||||
// Initialize managed instance
|
||||
if (params.Managed)
|
||||
{
|
||||
object->SetManagedInstance((MObject*)params.Managed);
|
||||
}
|
||||
else
|
||||
// Initialize managed instance (ScriptingObject ctor copies managed object handle)
|
||||
if (!params.Managed)
|
||||
{
|
||||
// Invoke managed ctor (to match C++ logic)
|
||||
object->CreateManaged();
|
||||
|
||||
Reference in New Issue
Block a user