zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-31 14:00:22 +01:00
commit 5967016dbe
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,6 +447,11 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
} }
else if (tx->bHasCanvas) else if (tx->bHasCanvas)
{ {
if (tx->gl_info.shaderindex >= FIRST_USER_SHADER)
{
mShaderIndex = tx->gl_info.shaderindex;
}
// no brightmap for cameratexture
} }
else else
{ {