X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=448db60a91f967cca6362a2ad9e5c41ff5afdc68;hb=b1c863c9e053f2250327a743cee92b98c39e1268;hp=158e9fc8390206aea6025f7fae37ab844048068c;hpb=e7556941c41b1a0fc84fe7986c98ee79eccbf564;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 158e9fc8..448db60a 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -102,7 +102,10 @@ void RenderPass::Loader::init()
 void RenderPass::Loader::material_inline()
 {
 	RefPtr<Material> mat = new Material;
-	load_sub(*mat);
+	if(coll)
+		load_sub(*mat, get_collection());
+	else
+		load_sub(*mat);
 	obj.material = mat;
 }
 
@@ -173,7 +176,10 @@ void RenderPass::TextureLoader::texture(const string &name)
 void RenderPass::TextureLoader::texture2d()
 {
 	tex = new Texture2D;
-	load_sub(static_cast<Texture2D &>(*tex));
+	if(coll)
+		load_sub(static_cast<Texture2D &>(*tex), get_collection());
+	else
+		load_sub(static_cast<Texture2D &>(*tex));
 }
 
 } // namespace GL