zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 00:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed fallback lookup for multipatch textures referencing themselves as patch.

Browse source 
The code hadn't been properly updated to the new 3-layer texture system.
This commit is contained in:
Christoph Oelckers 2020-06-09 23:18:55 +02:00
parent af7c2fb4e9
commit 2d13dcfc81
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/textures/multipatchtexturebuilder.cpp
View file

@ -779,13 +779,10 @@ void FMultipatchTextureBuilder::ResolvePatches(BuildInfo &buildinfo)
TexMan.ListTextures(buildinfo.Inits[i].TexName, list, true); TexMan.ListTextures(buildinfo.Inits[i].TexName, list, true);
for (int i = list.Size() - 1; i >= 0; i--) for (int i = list.Size() - 1; i >= 0; i--)
{ {
if (list[i] != buildinfo.texture->GetID()) auto gtex = TexMan.GetGameTexture(list[i]);
if (gtex && gtex != buildinfo.texture && gtex->GetTexture() && gtex->GetTexture()->GetImage() && !dynamic_cast<FMultiPatchTexture*>(gtex->GetTexture()->GetImage()))
{ {
auto gtex = TexMan.GetGameTexture(list[i]); texno = list[i];
if (gtex && !dynamic_cast<FMultiPatchTexture*>(gtex->GetTexture()))
{
texno = list[i];
}
break; break;
} }
} }