From Paul Martz, changes for compiling against OpenGL 3.x

2009-11-03 16:34:54 +00:00
parent 8d67c9bb33
commit 72ff1f40f9
22 changed files with 87 additions and 32 deletions
--- a/applications/present3D/present3D.cpp
+++ b/applications/present3D/present3D.cpp
@@ -723,7 +723,7 @@ int main( int argc, char **argv )
    }


-#if !defined(OSG_GLES2_AVAILABLE)
+#if !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)

    // add back in enabling of the GL_ALPHA_TEST to get around the core OSG no longer setting it by default for opaque bins.
    // the alpha test is required for the volume rendering alpha clipping to work.