From 0c9001e3d1d58a871d799f10cf6ff2c64fe0569f Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Wed, 2 Nov 2022 16:47:06 +0100 Subject: [PATCH] Fixes --- Source/Engine/Content/Asset.cpp | 3 ++- Source/Engine/Level/Actor.cpp | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Source/Engine/Content/Asset.cpp b/Source/Engine/Content/Asset.cpp index 842f76ff8..a7aeeab3d 100644 --- a/Source/Engine/Content/Asset.cpp +++ b/Source/Engine/Content/Asset.cpp @@ -154,7 +154,8 @@ void SoftAssetReferenceBase::OnResolve(const ScriptingTypeHandle& type) void SoftAssetReferenceBase::OnUnloaded(Asset* asset) { - ASSERT(_asset == asset); + if (_asset != asset) + return; _asset->RemoveReference(); _asset->OnUnloaded.Unbind(this); _asset = nullptr; diff --git a/Source/Engine/Level/Actor.cpp b/Source/Engine/Level/Actor.cpp index 7d21f96b8..d521401d6 100644 --- a/Source/Engine/Level/Actor.cpp +++ b/Source/Engine/Level/Actor.cpp @@ -509,21 +509,9 @@ void Actor::SetTag(const StringView& tagName) void Actor::SetName(const StringView& value) { - // Validate name - if (value.Length() == 0) - { - LOG(Warning, "Cannot change actor '{0}' name. Name cannot be empty.", ToString()); - return; - } - - // Check if name won't change if (_name == value) return; - - // Set name _name = value; - - // Fire events if (GetScene()) Level::callActorEvent(Level::ActorEventType::OnActorNameChanged, this, nullptr); }