From 6548ca1148a4164cac9c6799b35430ddd041bf3f Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 13 Feb 2024 10:43:20 +0100 Subject: [PATCH] Fix `JsonAsset::GetInstance` to properly check base class #2224 --- Source/Engine/Content/JsonAsset.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Content/JsonAsset.h b/Source/Engine/Content/JsonAsset.h index a8e89cec0..21b68c691 100644 --- a/Source/Engine/Content/JsonAsset.h +++ b/Source/Engine/Content/JsonAsset.h @@ -139,7 +139,8 @@ public: T* GetInstance() const { const_cast(this)->CreateInstance(); - return Instance && InstanceType.IsAssignableFrom(T::TypeInitializer) ? (T*)Instance : nullptr; + const ScriptingTypeHandle& type = T::TypeInitializer; + return Instance && type.IsAssignableFrom(InstanceType) ? (T*)Instance : nullptr; } public: