Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-05-11 13:29:37 +02:00
commit 5947584bff

View file

@ -251,7 +251,7 @@ void FRenderState::Apply(bool forcenoshader)
{ {
glAlphaFunc = mAlphaFunc; glAlphaFunc = mAlphaFunc;
glAlphaThreshold = mAlphaThreshold; glAlphaThreshold = mAlphaThreshold;
::glBlendFunc(mAlphaFunc, mAlphaThreshold); ::glAlphaFunc(mAlphaFunc, mAlphaThreshold);
} }
if (mAlphaTest != glAlphaTest) if (mAlphaTest != glAlphaTest)
{ {