Merge pull request #155 from LaurensVoerman/Texture0

add #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter
2016-10-12 13:41:57 +01:00
parent c92de93429 1a664b19de
commit 953af3d1d9
1 changed files with 4 additions and 0 deletions
--- a/include/osg/State
+++ b/include/osg/State
@@ -38,6 +38,10 @@
 #include <set>
 #include <string>

+#ifndef GL_TEXTURE0
+#define GL_TEXTURE0 0x84C0
+#endif
+
 namespace osg {

 /** macro for use with osg::StateAttribute::apply methods for detecting and