From a0fc06bf94ff36c4cb5d326b4ca93a62a3148f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Dec 2011 02:20:38 +0100
Subject: [PATCH] Making Texture data setting functions public.

---
 src/CubeMapTexture.h | 1 -
 src/Texture.h        | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/CubeMapTexture.h b/src/CubeMapTexture.h
index e52c1fcf0..c2f4c7d14 100644
--- a/src/CubeMapTexture.h
+++ b/src/CubeMapTexture.h
@@ -54,7 +54,6 @@ class CubeMapTexture: public Texture2D {
          */
         inline CubeMapTexture(GLint layer = 0): Texture2D(layer, GL_TEXTURE_CUBE_MAP) {}
 
-    protected:
         /** @brief Deleted. Use @ref setDataPositiveX(GLint, InternalFormat, const Math::Vector<GLsizei, Dimensions>&, ColorFormat, const T*) "setDataPositiveX()" and others instead. */
         template<class T> inline void setData(GLint mipLevel, InternalFormat internalFormat, const Math::Vector<GLsizei, Dimensions>& _dimensions, ColorFormat colorFormat, const T* data) = delete;
 
diff --git a/src/Texture.h b/src/Texture.h
index 9e357b328..a4da76af3 100644
--- a/src/Texture.h
+++ b/src/Texture.h
@@ -26,8 +26,7 @@ namespace Magnum {
 /**
 @brief %Texture
 
-Template class for one- to three-dimensional textures. Recommended usage is via
-subclassing and setting texture data from e.g. constructor with setData().
+Template class for one- to three-dimensional textures.
 
 @attention Don't forget to call setMinificationFilter() and
 setMagnificationFilter() after creating the texture, otherwise it will be
@@ -75,7 +74,6 @@ template<size_t dimensions> class Texture: public AbstractTexture {
          */
         void setWrapping(const Math::Vector<Wrapping, dimensions>& wrapping);
 
-    protected:
         /**
          * @brief Set texture data
          * @param mipLevel          Mip level