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

Merge branch 'master' into Improve-HighlightedPopUpColor

Browse Source
This commit is contained in:
Phantom
2026-03-04 22:33:45 +01:00
parent 6ed7e8fa40 cee1b72f2f
commit dfdcd47ad7
12 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,7 +247,7 @@ VariantType::VariantType(VariantType&& other) noexcept
VariantType& VariantType::operator=(const Types& type)
{
Type = type;
if (StaticName)
if (!StaticName)
Allocator::Free(TypeName);
TypeName = nullptr;
StaticName = 0;
@@ -266,7 +266,7 @@ VariantType& VariantType::operator=(const VariantType& other)
{
ASSERT(this != &other);
Type = other.Type;
if (StaticName)
if (!StaticName)
Allocator::Free(TypeName);
StaticName = other.StaticName;
if (StaticName)
@@ -316,7 +316,7 @@ void VariantType::SetTypeName(const StringView& typeName)
{
if (StringUtils::Length(TypeName) != typeName.Length())
{
if (StaticName)
if (!StaticName)
Allocator::Free(TypeName);
StaticName = 0;
TypeName = static_cast<char*>(Allocator::Allocate(typeName.Length() + 1));
@@ -329,7 +329,7 @@ void VariantType::SetTypeName(const StringAnsiView& typeName, bool staticName)
{
if (StringUtils::Length(TypeName) != typeName.Length() || StaticName != staticName)
{
if (StaticName)
if (!StaticName)
Allocator::Free(TypeName);
StaticName = staticName;
if (staticName)