X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=b588ff2dc8a119624bcf5297ad5483f8fef972dc;hb=53953f28255e782ed640a9e8d2d42c9b218943ad;hp=4063df5fcf27ea5c56069cd8621473f181e9a3ce;hpb=bdacc1cf89edcc8d8a00364aa20c9472744cd9ca;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 4063df5f..b588ff2d 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -46,13 +46,14 @@ RenderPass &RenderPass::operator=(const RenderPass &other)
 RenderPass::~RenderPass()
 {
 	delete texturing;
+	delete shdata;
 }
 
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shdata = data;
-	shdata.keep();
+	delete shdata;
+	shdata = new ProgramData(*data);
 }
 
 void RenderPass::set_material(const Material *mat)
@@ -81,7 +82,7 @@ void RenderPass::apply(Renderer &renderer) const
 {
 	renderer.set_texturing(texturing);
 	renderer.set_material(material.get());
-	renderer.set_shader_program(shprog, shdata.get());
+	renderer.set_shader_program(shprog, shdata);
 	renderer.set_reverse_winding(back_faces);
 }
 
@@ -103,6 +104,7 @@ void RenderPass::Loader::init()
 	add("shader",   &RenderPass::shprog);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
+	add("material_slot", &RenderPass::material_slot);
 	add("back_faces",&RenderPass::back_faces);
 	add("texunit",  &Loader::texunit);
 	add("texunit",  &Loader::texunit_named);
@@ -143,9 +145,9 @@ void RenderPass::Loader::uniforms()
 {
 	if(!obj.shprog)
 		throw invalid_operation("RenderPass::Loader::uniforms");
-	RefPtr<ProgramData> shd = new ProgramData;
+	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
 	load_sub(*shd);
-	obj.shdata = shd;
+	obj.shdata = shd.release();
 }