Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Fixed case where texture is loaded for both additive and non-additive

Browse source
This commit is contained in:
Brian Fiete 2025-01-14 10:14:35 -08:00
parent 96c0a44a7e
commit d1aa3de25e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BeefySysLib/platform/win/DXRenderDevice.cpp
View file

@ -2106,8 +2106,12 @@ Texture* DXRenderDevice::LoadTexture(const StringImpl& fileName, int flags)
return aTexture; return aTexture;
} }
String pathEx = fileName;
if ((flags & TextureFlag_Additive) != 0)
pathEx += ":add";
DXTexture* aTexture = NULL; DXTexture* aTexture = NULL;
if (mTextureMap.TryGetValue(fileName, &aTexture)) if (mTextureMap.TryGetValue(pathEx, &aTexture))
{ {
aTexture->AddRef(); aTexture->AddRef();
return aTexture; return aTexture;
@ -2251,7 +2255,7 @@ Texture* DXRenderDevice::LoadTexture(const StringImpl& fileName, int flags)
aTexture = (DXTexture*)RenderDevice::LoadTexture(fileName, flags); aTexture = (DXTexture*)RenderDevice::LoadTexture(fileName, flags);
if (aTexture != NULL) if (aTexture != NULL)
{ {
aTexture->mPath = fileName; aTexture->mPath = pathEx;
mTextureMap[aTexture->mPath] = aTexture; mTextureMap[aTexture->mPath] = aTexture;
} }