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

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-19 19:46:19 +02:00
parent 3498806588 9afb8778e8
commit dee2f11ae4
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Engine/Core/Types/Variant.cpp
View File

@@ -498,8 +498,13 @@ Variant::Variant(Variant&& other) noexcept
other.AsDictionary = nullptr; other.AsDictionary = nullptr;
break; break;
case VariantType::ManagedObject: case VariantType::ManagedObject:
#if USE_NETCORE
AsUint64 = other.AsUint64;
other.AsUint64 = 0;
#elif USE_MONO
AsUint = other.AsUint; AsUint = other.AsUint;
other.AsUint = 0; other.AsUint = 0;
#endif
break; break;
case VariantType::Null: case VariantType::Null:
case VariantType::Void: case VariantType::Void:
@@ -1022,8 +1027,13 @@ Variant& Variant::operator=(Variant&& other)
other.AsDictionary = nullptr; other.AsDictionary = nullptr;
break; break;
case VariantType::ManagedObject: case VariantType::ManagedObject:
#if USE_NETCORE
AsUint64 = other.AsUint64;
other.AsUint64 = 0;
#elif USE_MONO
AsUint = other.AsUint; AsUint = other.AsUint;
other.AsUint = 0; other.AsUint = 0;
#endif
break; break;
case VariantType::Null: case VariantType::Null:
case VariantType::Void: case VariantType::Void:
@@ -2420,7 +2430,11 @@ void Variant::SetType(const VariantType& type)
AsDictionary = New<Dictionary<Variant, Variant>>(); AsDictionary = New<Dictionary<Variant, Variant>>();
break; break;
case VariantType::ManagedObject: case VariantType::ManagedObject:
#if USE_NETCORE
AsUint64 = 0;
#elif USE_MONO
AsUint = 0; AsUint = 0;
#endif
break; break;
case VariantType::Structure: case VariantType::Structure:
AllocStructure(); AllocStructure();
@@ -2533,7 +2547,11 @@ void Variant::SetType(VariantType&& type)
AsDictionary = New<Dictionary<Variant, Variant>>(); AsDictionary = New<Dictionary<Variant, Variant>>();
break; break;
case VariantType::ManagedObject: case VariantType::ManagedObject:
#if USE_NETCORE
AsUint64 = 0;
#elif USE_MONO
AsUint = 0; AsUint = 0;
#endif
break; break;
case VariantType::Structure: case VariantType::Structure:
AllocStructure(); AllocStructure();
@@ -2672,7 +2690,11 @@ void Variant::SetManagedObject(MObject* object)
{ {
if (Type.Type != VariantType::ManagedObject || Type.TypeName) if (Type.Type != VariantType::ManagedObject || Type.TypeName)
SetType(VariantType(VariantType::ManagedObject)); SetType(VariantType(VariantType::ManagedObject));
#if USE_NETCORE
AsUint64 = 0;
#elif USE_MONO
AsUint = 0; AsUint = 0;
#endif
} }
#endif #endif
} }