From ec8779ca6f92ecaa846ae699e91d29ed2117e16c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Jul 2015 14:03:24 +0000 Subject: [PATCH] Moved GL_ALPHA_TEST from AlphaFunc header to GLDefines header git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15002 16af8721-9629-0410-8352-f15c8da7e697 --- include/osg/AlphaFunc | 4 ---- include/osg/GLDefines | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc index f63f50f1f..953586517 100644 --- a/include/osg/AlphaFunc +++ b/include/osg/AlphaFunc @@ -16,10 +16,6 @@ #include -#ifndef GL_ALPHA_TEST - #define GL_ALPHA_TEST 0x0BC0 -#endif - namespace osg { /** Encapsulates OpenGL glAlphaFunc. diff --git a/include/osg/GLDefines b/include/osg/GLDefines index b3b44cea0..f97dbfa5c 100644 --- a/include/osg/GLDefines +++ b/include/osg/GLDefines @@ -600,6 +600,10 @@ typedef char GLchar; #define GL_RASTERIZER_DISCARD 0x8C89 #endif +#ifndef GL_ALPHA_TEST + #define GL_ALPHA_TEST 0x0BC0 +#endif + namespace osg { #ifndef GL_VERSION_3_2