]> git.tdb.fi Git - libs/gl.git/blobdiff - source/materials/material.cpp
Overhaul texture management in rendering classes
[libs/gl.git] / source / materials / material.cpp
index eaabad157002b793f64a9d1575238618856e9223..3eaf83ab9b59728b1f21c1800acb2ecc2f1c4f33 100644 (file)
@@ -43,6 +43,8 @@ const Program *Material::create_compatible_shader(DataFile::Collection &coll) co
        return shprog;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
        if(!tex)
@@ -62,6 +64,7 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
        texturing.attach(unit, *tex, sampler);
        tex_shdata.uniform(name, unit);
 }
+#pragma GCC diagnostic pop
 
 Material::MaterialRegistry &Material::get_material_registry()
 {