Merge branch 'master' into text_improvements

include/osg/Image

@@ -68,6 +68,10 @@
 #endif
 
 #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) || defined(OSG_GL3_AVAILABLE)
+    #define GL_ALPHA4               0x803B
+    #define GL_ALPHA8               0x803C
+    #define GL_ALPHA12              0x803D
+    #define GL_ALPHA16              0x803E
     #define GL_BITMAP               0x1A00
     #define GL_COLOR_INDEX          0x1900
     #define GL_INTENSITY12          0x804C

include/osg/VertexArrayState

@@ -34,6 +34,8 @@ public:
                 modifiedCount(0xffffffff),
                 active(false) {}
 
+            virtual const char* className() const = 0; // { return "ArrayDispatch"; }
+
             virtual void enable_and_dispatch(osg::State& /*state*/, const osg::Array* /*new_array*/) {} // = 0;
 
             virtual void enable_and_dispatch(osg::State& /*state*/, const osg::Array* /*new_array*/, const osg::GLBufferObject* /*vbo*/) {} // = 0;

include/osg/VertexAttribDivisor

@@ -50,6 +50,7 @@ class OSG_EXPORT VertexAttribDivisor : public StateAttribute
             COMPARE_StateAttribute_Types(VertexAttribDivisor,sa)
 
             // compare each parameter in turn against the rhs.
+            COMPARE_StateAttribute_Parameter(_index)
             COMPARE_StateAttribute_Parameter(_divisor)
 
             return 0; // passed all the above comparison macros, must be equal.

include/osgDB/Registry

@@ -366,6 +366,13 @@ class OSGDB_EXPORT Registry : public osg::Referenced
         /** Set the password map to be used by plugins when access files from secure locations.*/
         void setAuthenticationMap(AuthenticationMap* authenticationMap) { _authenticationMap = authenticationMap; }
 
+        /** Get the password map to be used by plugins when access files from secure locations. Create a AuthenticationMap if one isn't already assigned.*/
+        AuthenticationMap* getOrCreateAuthenticationMap()
+        {
+            if (!_authenticationMap) _authenticationMap = new AuthenticationMap;
+            return _authenticationMap.get();
+        }
+
         /** Get the password map to be used by plugins when access files from secure locations.*/
         AuthenticationMap* getAuthenticationMap() { return _authenticationMap.get(); }