X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectpass.cpp;h=afb9f45d96b7209bb9dd63dab6e3b91229e89fdb;hb=99b656a7c44859a038156b82365122a5e336b1e8;hp=57e7b278eca81597fc0502b35cc3a27a61bb699c;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/objectpass.cpp b/source/objectpass.cpp
index 57e7b278..afb9f45d 100644
--- a/source/objectpass.cpp
+++ b/source/objectpass.cpp
@@ -16,7 +16,8 @@ namespace GL {
 
 ObjectPass::ObjectPass():
 	shprog(0),
-	shdata(0)
+	shdata(0),
+	use_textures(true)
 { }
 
 ObjectPass::~ObjectPass()
@@ -29,11 +30,12 @@ ObjectPass::Loader::Loader(ObjectPass &p, Collection &c):
 	coll(c)
 {
 	add("shader", &Loader::shader);
+	add("use_textures", &ObjectPass::use_textures);
 }
 
 void ObjectPass::Loader::shader(const string &n)
 {
-	Program *shprog=&coll.get<Program>(n);
+	Program *shprog=coll.get<Program>(n);
 	if(shprog)  // Allow for unsupported shaders
 	{
 		RefPtr<ProgramData> shdata=new ProgramData;