Always assume Technique has shaders

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

diff --git a/source/materials/technique.h b/source/materials/technique.h
index 47a307c9af318b111ef2266b93fc9442ece058e1..bfd979aae573c26f5a29330ff2a5a1c86981d1d0 100644 (file)
--- a/source/materials/technique.h
+++ b/source/materials/technique.h
@@ -19,15 +19,20 @@ public:
        class Loader: public Msp::DataFile::CollectionObjectLoader<Technique>
        {
        private:
+               std::string inline_base_name;
+
                static ActionMap shared_actions;
 
        public:
                Loader(Technique &);
                Loader(Technique &, Collection &);
-
        private:
                virtual void init_actions();
 
+       public:
+               void set_inline_base_name(const std::string &);
+
+       private:
                void inherit(const std::string &);
                void pass(const std::string &);
        };
@@ -59,7 +64,7 @@ public:
        bool replace_texture(const std::string &, const Texture &);
        bool replace_material(const std::string &, const Material &);
        bool replace_uniforms(const ProgramData &);
-       bool has_shaders() const;
+       DEPRECATED bool has_shaders() const;
 
        void set_debug_name(const std::string &);
 };