From eb03d8e77eddf12e79f8ab1d9dfd4d0cfb721863 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 10 May 2012 03:47:40 +0000 Subject: [PATCH] - There doesn't seem to be much point to this inf==NULL check when inf isn't used either way... SVN r3635 (trunk) --- src/textures/multipatchtexture.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp index 4e7d344db..c1fc95492 100644 --- a/src/textures/multipatchtexture.cpp +++ b/src/textures/multipatchtexture.cpp @@ -573,7 +573,7 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota // rotated multipatch parts cannot be composited directly bool rotatedmulti = Parts[i].Rotate != 0 && Parts[i].Texture->bMultiPatch; - memset (&info, 0, sizeof (info)); + memset (&info, 0, sizeof(info)); info.alpha = Parts[i].Alpha; info.invalpha = FRACUNIT - info.alpha; info.op = ECopyOp(Parts[i].op); @@ -597,12 +597,11 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota info.blendcolor[0] = b.r * (FRACUNIT-info.blendcolor[3]); info.blendcolor[1] = b.g * (FRACUNIT-info.blendcolor[3]); info.blendcolor[2] = b.b * (FRACUNIT-info.blendcolor[3]); - info.blend = BLEND_OVERLAY; } } - if ((!Parts[i].Texture->bComplex || inf == NULL) && !rotatedmulti) + if (!Parts[i].Texture->bComplex && !rotatedmulti) { if (Parts[i].Translation != NULL) {