X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=3eaf83ab9b59728b1f21c1800acb2ecc2f1c4f33;hp=eaabad157002b793f64a9d1575238618856e9223;hb=6f39983060a27634c012f66c82fea0d09fea9774;hpb=3af09f06e9f69532e5adfe6bcd9a7b2d1aea6d5b diff --git a/source/materials/material.cpp b/source/materials/material.cpp index eaabad15..3eaf83ab 100644 --- a/source/materials/material.cpp +++ b/source/materials/material.cpp @@ -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() {