X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=34a311e79ece2f7e4df91d382010dca39137be1f;hb=41368577ab4c4091e19d4e9cbbf8fbf2cfbdddca;hp=d2ce1652fa682138bd5592dd7698e7b4b01060d5;hpb=96e13fc706ba4e1702ff90eb999ee0660278cb0d;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index d2ce1652..34a311e7 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -52,6 +52,15 @@ RenderPass::~RenderPass()
 	delete texturing;
 }
 
+void RenderPass::finalize_material()
+{
+	ensure_private_shader_data();
+
+	if(!texturing)
+		texturing = new Texturing;
+	material->attach_textures_to(*texturing, *shdata);
+}
+
 void RenderPass::ensure_private_shader_data()
 {
 	if(!shprog)
@@ -84,6 +93,7 @@ void RenderPass::set_material(const Material *mat)
 {
 	material = mat;
 	material.keep();
+	finalize_material();
 }
 
 void RenderPass::set_texture(unsigned index, const Texture *tex)
@@ -139,18 +149,17 @@ void RenderPass::Loader::init()
 
 void RenderPass::Loader::material_inline()
 {
-	RefPtr<Material> mat = new Material;
-	if(coll)
-		load_sub(*mat, get_collection());
-	else
-		load_sub(*mat);
-	obj.material = mat;
+	Material::GenericLoader ldr(coll);
+	load_sub_with(ldr);
+	obj.material = ldr.get_material();
+	obj.finalize_material();
 }
 
 void RenderPass::Loader::material(const string &name)
 {
 	obj.material = &get_collection().get<Material>(name);
 	obj.material.keep();
+	obj.finalize_material();
 }
 
 void RenderPass::Loader::texunit(unsigned i)
@@ -182,9 +191,7 @@ void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 void RenderPass::Loader::uniforms()
 {
 	obj.ensure_private_shader_data();
-	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
-	load_sub(*shd);
-	obj.shdata = shd.release();
+	load_sub(*obj.shdata);
 }
 
 void RenderPass::Loader::uniform_slot(const string &name)