From e84e0774a6ea5da748f63b8f3ceef9ab02d0e875 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 20 Aug 2021 17:49:36 +0200 Subject: [PATCH] Fix material text icons with some techsets causing issues when rendering --- src/Components/Modules/Materials.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Components/Modules/Materials.cpp b/src/Components/Modules/Materials.cpp index 79d70a12..5b53c434 100644 --- a/src/Components/Modules/Materials.cpp +++ b/src/Components/Modules/Materials.cpp @@ -161,7 +161,12 @@ namespace Components Materials::ImageNameLength = 4 + length; std::string image(imagePtr, length); - return Game::DB_FindXAssetHeader(Game::XAssetType::ASSET_TYPE_MATERIAL, image.data()).material; + auto* material = Game::DB_FindXAssetHeader(Game::XAssetType::ASSET_TYPE_MATERIAL, image.data()).material; + + if(material == nullptr || material->techniqueSet == nullptr || material->techniqueSet->name == nullptr || strcmp(material->techniqueSet->name, "2d") != 0) + return Game::DB_FindXAssetHeader(Game::XAssetType::ASSET_TYPE_MATERIAL, "default").material; + + return material; } Materials::ImageNameLength = 4;