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

diff --git a/source/technique.cpp b/source/technique.cpp
index def0a84a..928c4ff6 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -44,6 +44,22 @@ bool Technique::replace_texture(const string &slot, const Texture &tex)
 	return replaced;
 }
 
+bool Technique::replace_material(const string &slot, const Material &mat)
+{
+	bool replaced = false;
+	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+	{
+		const string &pass_slot = i->second.get_material_slot_name();
+		if(!pass_slot.empty() && pass_slot==slot)
+		{
+			i->second.set_material(&mat);
+			replaced = true;
+		}
+	}
+
+	return replaced;
+}
+
 bool Technique::has_shaders() const
 {
 	for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
@@ -97,10 +113,14 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 	add("texture", &InheritLoader::texture);
 }
 
-void Technique::InheritLoader::material(const string &pass_tag, const string &name)
+void Technique::InheritLoader::material(const string &slot, const string &name)
 {
-	RenderPass &pass = get_item(obj.passes, pass_tag);
 	const Material &mat = get_collection().get<Material>(name);
+	if(obj.replace_material(slot, mat))
+		return;
+
+	// For backwards compatibility
+	RenderPass &pass = get_item(obj.passes, slot);
 	if(const Material *base_mat = pass.get_material())
 	{
 		for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)