From a2ecbe53dd212f604d59f9d5e1a4cc90aa4a381e Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 10 Aug 2021 03:13:46 -0500 Subject: [PATCH] gcc seems to have an issue converting nullptr to Resource, so this will at least get it compiling --- Engine/source/T3D/assets/ShapeAsset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index d7cf981c0..d2ec353e7 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/Engine/source/T3D/assets/ShapeAsset.h @@ -517,7 +517,7 @@ public: \ Resource get##name##Resource(const U32& index) \ {\ if(index >= sm##name##Count || index < 0)\ - return nullptr;\ + return ResourceManager::get().load( "" );\ return m##name[index];\ }