From 1408c2664e60b1ff531e2eeef89fa4e661fbdc1e Mon Sep 17 00:00:00 2001 From: Mathieu MARACHE Date: Mon, 28 Aug 2017 09:44:10 +0200 Subject: [PATCH] osg::Program::isFixedFunction() should'nt return true fixed function is unavailable, even if _shaderList.empty() is true --- src/osg/Program.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osg/Program.cpp b/src/osg/Program.cpp index 22e3ca052..7092a565a 100644 --- a/src/osg/Program.cpp +++ b/src/osg/Program.cpp @@ -633,10 +633,14 @@ Program::PerContextProgram* Program::getPCP(State& state) const bool Program::isFixedFunction() const { +#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE // A Program object having no attached Shaders is a special case: // it indicates that programmable shading is to be disabled, // and thus use GL 1.x "fixed functionality" rendering. return _shaderList.empty(); +#else + return false; +#endif }