diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute
index fa9fb66ba..07e47c221 100644
--- a/include/osg/StateAttribute
+++ b/include/osg/StateAttribute
@@ -93,13 +93,19 @@ class SG_EXPORT StateAttribute : public Object
           * that types value. */
         enum Types
         {
-            ALPHAFUNC       =1,
-            ANTIALIAS       =2,
-            COLORTABLE      =3,
-            CULLFACE        =4,
-            FOG             =5,
-            FRONTFACE       =6,
-            LIGHT           =7,
+            TEXTURE         =0,
+            TEXTURE_0       =TEXTURE+0,
+            TEXTURE_1       =TEXTURE+1,
+            TEXTURE_2       =TEXTURE+2,
+            TEXTURE_3       =TEXTURE+3,
+            MATERIAL        =4,
+            ALPHAFUNC       =5,
+            ANTIALIAS       =6,
+            COLORTABLE      =6,
+            CULLFACE        =8,
+            FOG             =9,
+            FRONTFACE       =10,
+            LIGHT           =11,
             LIGHT_0         =LIGHT+0,
             LIGHT_1         =LIGHT+1,
             LIGHT_2         =LIGHT+2,
@@ -108,30 +114,24 @@ class SG_EXPORT StateAttribute : public Object
             LIGHT_5         =LIGHT+5,
             LIGHT_6         =LIGHT+6,
             LIGHT_7         =LIGHT+7,
-            MATERIAL        =15,
-            POINT           =16,
-            POLYGONMODE     =17,
-            POLYGONOFFSET   =18,
-            TEXENV          =19,
-            TEXGEN          =20,
-            TEXMAT          =21,
-            TEXTURE         =22,
-            TEXTURE_0       =TEXTURE+0,
-            TEXTURE_1       =TEXTURE+1,
-            TEXTURE_2       =TEXTURE+2,
-            TEXTURE_3       =TEXTURE+3,
-            TRANSPARENCY    =26,
-            STENCIL         =27,
-            COLORMASK       =28,
+            POINT           =18,
+            POLYGONMODE     =19,
+            POLYGONOFFSET   =20,
+            TEXENV          =21,
+            TEXGEN          =22,
+            TEXMAT          =23,
+            TRANSPARENCY    =24,
+            STENCIL         =25,
+            COLORMASK       =26,
+            DEPTH           =27,
+            VIEWPORT        =28,
             CLIPPLANE       =29,
             CLIPPLANE_0     =CLIPPLANE+0,
             CLIPPLANE_1     =CLIPPLANE+1,
             CLIPPLANE_2     =CLIPPLANE+2,
             CLIPPLANE_3     =CLIPPLANE+3,
             CLIPPLANE_4     =CLIPPLANE+4,
-            CLIPPLANE_5     =CLIPPLANE+5,
-            DEPTH           =35,
-            VIEWPORT        =36
+            CLIPPLANE_5     =CLIPPLANE+5
         };
 
         StateAttribute() {}