OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into v2.x

Browse source 
Conflicts:
	src/gl/textures/gl_material.cpp
This commit is contained in:
Christoph Oelckers 2014-09-09 01:30:11 +02:00
commit 9b8869e78d
18 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gl/textures/gl_texture.cpp
View file

@ -569,7 +569,7 @@ bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h)
l1+=4;
for(x=1;x<w-1;x++, l1+=4)
{
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1) && !CHKPIX(1)) CHKPIX(w);
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1) && !CHKPIX(1) && !CHKPIX(-w-1) && !CHKPIX(-w+1) && !CHKPIX(w-1) && !CHKPIX(w+1)) CHKPIX(w);
}
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1)) CHKPIX(w);
l1+=4;