X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=21edb81a74ae53ac67d0c18dff005709c048c431;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=61b1bebdbac92611e9fcc853eea99a4a4e19a5a4;hpb=d16a4ab73f87d177296b59f04880ef7eba593df7;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 61b1bebd..21edb81a 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE_H_
 
 #include <istream>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "gl.h"
 #include "types.h"
 
@@ -37,11 +37,8 @@ one of the dimensioned texture classes.
 class Texture
 {
 protected:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Texture>
 	{
-	protected:
-		Texture &tex;
-
 	public:
 		Loader(Texture &);
 		void min_filter(TextureFilter);
@@ -62,6 +59,7 @@ public:
 	uint  get_id() const                 { return id; }
 
 	static void unbind();
+	static void unbind_from(unsigned);
 protected:
 	uint   id;
 	GLenum target;