zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Magnus Norddahl 2016-12-31 14:00:22 +01:00
parent 0884a09b38 3aee73eaa4
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)
{
if (tx->gl_info.shaderindex >= FIRST_USER_SHADER)
{
mShaderIndex = tx->gl_info.shaderindex;
}
// no brightmap for cameratexture
}
else
{