X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftechnique.cpp;h=def0a84a9dd019ea385919a883ff4c7e15fd3d62;hp=2b02f35f0cbc70d8cc8621f6a47c0a6f5caf2b9d;hb=c01b102f54770c37a62870f60a849b479aa3285c;hpb=c537fbfc72d3b76719b2080266291fcf7623750b

diff --git a/source/technique.cpp b/source/technique.cpp
index 2b02f35f..def0a84a 100644
--- 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