X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.h;h=442348dad4da4400b1ad6456633b0b8e15f1ffde;hp=a98b12844c5ae1fa1bfa3653cf89953117620026;hb=6f39983060a27634c012f66c82fea0d09fea9774;hpb=3af09f06e9f69532e5adfe6bcd9a7b2d1aea6d5b diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h index a98b1284..442348da 100644 --- a/source/materials/unlitmaterial.h +++ b/source/materials/unlitmaterial.h @@ -29,6 +29,8 @@ private: Color color; bool vertex_color; + static const Tag texture_tags[]; + public: UnlitMaterial(); @@ -36,7 +38,13 @@ protected: virtual void fill_program_info(std::string &, std::map &) const; public: - virtual void attach_textures_to(Texturing &, ProgramData &) const; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const; +#pragma GCC diagnostic pop + + virtual const Tag *get_texture_tags() const { return texture_tags; } + virtual const Texture *get_texture(Tag) const; void set_texture(const Texture *); void set_color(const Color &);