OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into Glew_Version_For_Real

Browse source
This commit is contained in:
Christoph Oelckers 2014-05-18 12:47:48 +02:00
commit 6e6be8ed5b
62 changed files with 651 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gl/models/gl_models.cpp
View file

@ -141,14 +141,7 @@ FTexture * LoadSkin(const char * path, const char * fn)
int texlump = FindGFXFile(buffer);
if (texlump>=0)
{
FTextureID texno = TexMan.FindTextureByLumpNum(texlump);
if (!texno.isValid())
{
FTexture *tex = FTexture::CreateTexture("", texlump, FTexture::TEX_Override);
TexMan.AddTexture(tex);
return tex;
}
return TexMan[texno];
return TexMan.FindTexture(Wads.GetLumpFullName(texlump), FTexture::TEX_Any, FTextureManager::TEXMAN_TryAny);
}
else
{