zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The texture compositor did not use a patch's translation.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-16 19:03:04 +01:00
parent e776dbce55
commit cce82e99d6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/textures/formats/multipatchtexture.cpp
View file

@ -315,7 +315,8 @@ int FMultiPatchTexture::CopyPixels(FBitmap *bmp, int conversion)
}
}
FBitmap Pixels = Parts[i].Image->GetCachedBitmap(nullptr, conversion, &ret);
auto trans = Parts[i].Translation ? Parts[i].Translation->Palette : nullptr;
FBitmap Pixels = Parts[i].Image->GetCachedBitmap(trans, conversion, &ret);
bmp->Blit(Parts[i].OriginX, Parts[i].OriginY, Pixels, &info);
// treat -1 (i.e. unknown) as absolute. We have no idea if this may have overwritten previous info so a real check needs to be done.
if (ret == -1) retv = ret;