Merged default into minor

--HG--
branch : minor

src/modules/graphics/opengl/OpenGL.h

@@ -187,13 +187,6 @@ public:
 	void drawArrays(GLenum mode, GLint first, GLsizei count);
 	void drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices);
 
-	/**
-	 * glDrawArraysInstanced and glDrawElementsInstanced with pseudo-instancing
-	 * fallbacks. They also increment the draw-call counter (once per call).
-	 **/
-	void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-	void drawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-
 	/**
 	 * Sets the current constant color.
 	 **/
@@ -369,9 +362,6 @@ private:
 
 		BlendState blend;
 
-		// The last ID value used for pseudo-instancing.
-		int lastPseudoInstanceID;
-
 		Matrix lastProjectionMatrix;
 		Matrix lastTransformMatrix;