Throw key_error if an inherited Technique uses nonexistent texture slot

diff --git a/source/technique.cpp b/source/technique.cpp
index 2b02f35f0cbc70d8cc8621f6a47c0a6f5caf2b9d..def0a84a9dd019ea385919a883ff4c7e15fd3d62 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -28,15 +28,20 @@ const RenderPass &Technique::get_pass(const Tag &tag) const
        return get_item(passes, tag);
 }
 
-void Technique::replace_texture(const string &slot, const Texture &tex)
+bool Technique::replace_texture(const string &slot, const Texture &tex)
 {
+       bool replaced = false;
        for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
        {
                int index = i->second.get_texture_index(slot);
-               if(index<0)
-                       continue;
-               i->second.set_texture(index, &tex);
+               if(index>=0)
+               {
+                       i->second.set_texture(index, &tex);
+                       replaced = true;
+               }
        }
+
+       return replaced;
 }
 
 bool Technique::has_shaders() const
@@ -108,7 +113,8 @@ void Technique::InheritLoader::material(const string &pass_tag, const string &na
 
 void Technique::InheritLoader::texture(const string &slot, const string &name)
 {
-       obj.replace_texture(slot, get_collection().get<Texture>(name));
+       if(!obj.replace_texture(slot, get_collection().get<Texture>(name)))
+               throw key_error(slot);
 }
 
 } // namespace GL

diff --git a/source/technique.h b/source/technique.h
index 7ea695378714d669dabfd8104030664fc1d42787..bed1db3385046e23af3311fc7dd649cd8fc8c0a1 100644 (file)
--- a/source/technique.h
+++ b/source/technique.h
@@ -50,7 +50,7 @@ public:
        bool has_pass(const Tag &) const;
        const RenderPass &get_pass(const Tag &) const;
        const PassMap &get_passes() const { return passes; }
-       void replace_texture(const std::string &, const Texture &);
+       bool replace_texture(const std::string &, const Texture &);
        bool has_shaders() const;
 };