OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
# Conflicts:
#	wadsrc/static/compatibility.txt
This commit is contained in:
Christoph Oelckers 2016-12-22 11:29:44 +01:00
commit 3b823fa3eb
40 changed files with 580 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/textures/multipatchtexture.cpp
View file

@ -531,7 +531,7 @@ void FMultiPatchTexture::MakeTexture ()
{
if (*out == 0 && in[3] != 0)
{
*out = RGB32k.RGB[in[2]>>3][in[1]>>3][in[0]>>3];
*out = RGB256k.RGB[in[2]>>2][in[1]>>2][in[0]>>2];
}
out += Height;
in += 4;