Merged default into minor

--HG--
branch : minor

src/modules/graphics/opengl/Image.h

@@ -149,6 +149,8 @@ public:
 	static bool getConstant(const char *in, FlagType &out);
 	static bool getConstant(FlagType in, const char *&out);
 
+	static int imageCount;
+
 private:
 
 	void uploadDefaultTexture();
@@ -179,6 +181,8 @@ private:
 	// back to a default texture.
 	bool usingDefaultTexture;
 
+	size_t textureMemorySize;
+
 	void preload();
 
 	void uploadCompressedData();