From b8de90a6759dcaa29f8d8bcbe8181245fa47d1fe Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 4 Feb 2020 19:52:23 +0100 Subject: [PATCH] ObjLoading: Do not attempt to load textures that already have a loaddef --- src/ObjLoading/Game/T6/ObjLoaderT6.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp index 7df53f59..e98f5bc9 100644 --- a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp +++ b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp @@ -106,11 +106,10 @@ void ObjLoaderT6::LoadImageData(ISearchPath* searchPath, Zone* zone) { auto* image = imageEntry->m_asset; - // TODO: Enable this when loadDef is no longer loaded into the temp block and never updated. - // if(image->texture.loadDef && image->texture.loadDef->resourceSize > 0) - // { - // continue; - // } + if(image->texture.loadDef && image->texture.loadDef->resourceSize > 0) + { + continue; + } std::string imageFileName = "images/" + std::string(image->name) + ".iwi"; auto* filePathImage = searchPath->Open(imageFileName);