Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d

This commit is contained in:
Christopher Bruns 2015-11-09 19:40:53 -05:00
commit bcac352265

View file

@ -71,7 +71,10 @@ CUSTOM_CVAR(Bool, gl_enhanced_nightvision, true, CVAR_ARCHIVE|CVAR_NOINITCALL)
{
// The fixed colormap state needs to be reset because if this happens when
// a shader is set to CM_LITE or CM_TORCH it won't register the change in behavior caused by this CVAR.
GLRenderer->mShaderManager->ResetFixedColormap();
if (GLRenderer != NULL && GLRenderer->mShaderManager != NULL)
{
GLRenderer->mShaderManager->ResetFixedColormap();
}
}
CVAR(Bool, gl_brightfog, false, CVAR_ARCHIVE);