X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=40d2b7ee96193627e148c2e4bf7189513cfbfc01;hb=160e9eea29bd10034733d59507fa1bcca36be401;hp=a5ee59e5ee1ecb9b181e53ffda03bf5562d0d8dd;hpb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;p=libs%2Fgl.git

diff --git a/source/materials/material.h b/source/materials/material.h
index a5ee59e5..40d2b7ee 100644
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -11,7 +11,7 @@
 namespace Msp {
 namespace GL {
 
-class Texturing;
+class Sampler;
 
 class Material
 {
@@ -105,14 +105,9 @@ public:
 	/** Returns the uniforms for the material. */
 	const ProgramData &get_shader_data() const { return shdata; }
 
-protected:
-	DEPRECATED void attach_texture_to(const Texture *, Texturing &, ProgramData &, const std::string &) const;
-public:
-	DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const = 0;
-
 	virtual const Tag *get_texture_tags() const = 0;
 	virtual const Texture *get_texture(Tag) const = 0;
-	const Sampler *get_sampler() const { return sampler; }
+	virtual const Sampler *get_sampler(Tag) const { return sampler; }
 
 	void set_debug_name(const std::string &);