Unconditionally disable alpha testing when shaders are used

components/shader/shadervisitor.cpp

@@ -374,9 +374,6 @@ namespace Shader
         writableStateSet->addUniform(new osg::Uniform("colorMode", reqs.mColorMode));
 
         defineMap["alphaFunc"] = std::to_string(reqs.mAlphaFunc);
-        if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
-        {
-            writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
 
         // back up removed state in case recreateShaders gets rid of the shader later
         osg::ref_ptr<osg::StateSet> removedState;
@@ -385,16 +382,21 @@ namespace Shader
         if (!removedState)
             removedState = new osg::StateSet();
 
-            if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
-                removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
-            // This disables the deprecated fixed-function alpha test
-            writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+        if (reqs.mAlphaFunc != osg::AlphaFunc::ALWAYS)
+        {
+            writableStateSet->addUniform(new osg::Uniform("alphaRef", reqs.mAlphaRef));
 
             const auto* alphaFunc = writableStateSet->getAttributePair(osg::StateAttribute::ALPHAFUNC);
             if (alphaFunc)
                 removedState->setAttribute(alphaFunc->first, alphaFunc->second);
             // This prevents redundant glAlphaFunc calls while letting the shadows bin still see the test
             writableStateSet->setAttribute(RemovedAlphaFunc::getInstance(reqs.mAlphaFunc), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        }
+
+        if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT)
+            removedState->setMode(GL_ALPHA_TEST, writableStateSet->getMode(GL_ALPHA_TEST));
+        // This disables the deprecated fixed-function alpha test
+        writableStateSet->setMode(GL_ALPHA_TEST, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
         if (!removedState->getModeList().empty() || !removedState->getAttributeList().empty())
         {
@@ -407,7 +409,6 @@ namespace Shader
 
             updateRemovedState(*writableUserData, removedState);
         }
-        }
 
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));