Check the flat qualifier from the correct member

[libs/gl.git] / source / materials / unlitmaterial.h

diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index 442348dad4da4400b1ad6456633b0b8e15f1ffde..f4f1086d32c68acd4aca0b557dd4d68b03551aa3 100644 (file)
--- a/source/materials/unlitmaterial.h
+++ b/source/materials/unlitmaterial.h
@@ -6,6 +6,10 @@
 namespace Msp {
 namespace GL {
 
+/**
+A material which performs no lighting calculations at all.  Useful for HUD
+graphics.
+*/
 class UnlitMaterial: public Material
 {
 public:
@@ -15,7 +19,6 @@ public:
                static ActionMap shared_actions;
 
        public:
-               Loader(UnlitMaterial &);
                Loader(UnlitMaterial &, Collection &);
 
        private:
@@ -25,9 +28,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 +41,6 @@ protected:
        virtual void fill_program_info(std::string &, std::map<std::string, int> &) 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;