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

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

@ -856,7 +856,7 @@ void FMaterial::Bind(int clampmode, int translation, int overrideshader)
FTexture *layer;
if (mTextureLayers[i].animated)
{
FTextureID id = mTextureLayers[i].texture->GetID();
FTextureID id = mTextureLayers[i].texture->id;
layer = TexMan(id);
ValidateSysTexture(layer, false);
}