X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.h;h=11641fa15be3a0b78de657af3669f0f399c12208;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=442348dad4da4400b1ad6456633b0b8e15f1ffde;hpb=6f39983060a27634c012f66c82fea0d09fea9774;p=libs%2Fgl.git diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h index 442348da..11641fa1 100644 --- a/source/materials/unlitmaterial.h +++ b/source/materials/unlitmaterial.h @@ -15,7 +15,6 @@ public: static ActionMap shared_actions; public: - Loader(UnlitMaterial &); Loader(UnlitMaterial &, Collection &); private: @@ -25,9 +24,9 @@ public: }; private: - const Texture *texture; + const Texture *texture = 0; Color color; - bool vertex_color; + bool vertex_color = false; static const Tag texture_tags[]; @@ -38,11 +37,6 @@ protected: virtual void fill_program_info(std::string &, std::map &) const; public: -#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;