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

- fixed: Camera textures may not be used as patch.

Browse source 
SVN r2296 (trunk)
This commit is contained in:
Christoph Oelckers 2010-04-21 06:42:48 +00:00
parent f6cd776e2d
commit e0419dde15
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/textures/multipatchtexture.cpp
View file

@ -499,6 +499,8 @@ void FMultiPatchTexture::MakeTexture ()
{
for (int i = 0; i < NumParts; ++i)
{
if (Parts[i].Texture->bHasCanvas) continue; // cannot use camera textures as patch.
BYTE *trans = Parts[i].Translation ? Parts[i].Translation->Remap : NULL;
{
if (Parts[i].Blend != 0)
@ -561,6 +563,8 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota
for(int i = 0; i < NumParts; i++)
{
int ret = -1;
if (Parts[i].Texture->bHasCanvas) continue; // cannot use camera textures as patch.
// rotated multipatch parts cannot be composited directly
bool rotatedmulti = Parts[i].Rotate != 0 && Parts[i].Texture->bMultiPatch;