FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Tree, moved GL_ #define's out of osg namespaces

Browse Source
This commit is contained in:
Robert Osfield
2005-01-07 19:00:40 +00:00
parent 814300f896
commit 40632c97b0
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osg/StateAttribute
View File

@@ -21,6 +21,12 @@
#include <typeinfo>
#include <utility>
// define for the GL_EXT_secondary_color extension, GL_COLOR_SUM is OpenGL
// mode to be used to enable and disable the second color.
#ifndef GL_COLOR_SUM
#define GL_COLOR_SUM 0x8458
#endif
namespace osg {
@@ -59,12 +65,6 @@ class StateSet;
if (rhs.parameter<parameter) return 1;
// define for the GL_EXT_secondary_color extension, GL_COLOR_SUM is OpenGL
// mode to be used to enable and disable the second color.
#ifndef GL_COLOR_SUM
#define GL_COLOR_SUM 0x8458
#endif
/** Base class for state attributes.
*/
class SG_EXPORT StateAttribute : public Object