X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fbasicmaterial.cpp;h=49a7476489e3f5af42997ee5b0176fd540b50771;hb=5b652353d545a3190ea2d86ba82a87b2e3382a0d;hp=30202a568f62a7964700f7f765cc3af84c3350f6;hpb=cb7db94f7837e6a3be037d07575dc248177d9426;p=libs%2Fgl.git diff --git a/source/materials/basicmaterial.cpp b/source/materials/basicmaterial.cpp index 30202a56..49a74764 100644 --- a/source/materials/basicmaterial.cpp +++ b/source/materials/basicmaterial.cpp @@ -41,19 +41,6 @@ void BasicMaterial::fill_program_info(string &module_name, map &spe spec_values["use_reflectivity_map"] = (reflectivity.texture!=0); } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -void BasicMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const -{ - attach_texture_to(diffuse.texture, texturing, tex_shdata, "diffuse_map"); - attach_texture_to(specular.texture, texturing, tex_shdata, "specular_map"); - attach_texture_to(normal.texture, texturing, tex_shdata, "normal_map"); - attach_texture_to(emission.texture, texturing, tex_shdata, "emission_map"); - attach_texture_to(shininess.texture, texturing, tex_shdata, "shininess_map"); - attach_texture_to(reflectivity.texture, texturing, tex_shdata, "reflectivity_map"); -} -#pragma GCC diagnostic pop - const Texture *BasicMaterial::get_texture(Tag tag) const { if(tag==texture_tags[0])