diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index 039ce237e..b751d0b72 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -163,7 +163,9 @@ class SG_EXPORT StateAttribute : public Object COLORMATRIX, VERTEXPROGRAM, - FRAGMENTPROGRAM + FRAGMENTPROGRAM, + + PROGRAMOBJECT // utilised in osgGL2/ProgramObject }; diff --git a/include/osgGL2/ProgramObject b/include/osgGL2/ProgramObject index f3aebcd46..52b1b6963 100644 --- a/include/osgGL2/ProgramObject +++ b/include/osgGL2/ProgramObject @@ -32,9 +32,6 @@ #include -// TODO This type enum must be officially added to osg::StateAttribute::Types -#define PROGRAMOBJECT (osg::StateAttribute::VERTEXPROGRAM + 1) - namespace osgGL2 { /** use deleteObject instead of glDeleteObject to allow