From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 2 Nov 2007 20:22:15 +0000 (+0000)
Subject: Adapt to DataFile changes
X-Git-Tag: 0.9~24
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=01525e40e4bc32b885196dd85ff68e876678d19d;p=libs%2Fgl.git

Adapt to DataFile changes
---

diff --git a/source/object.cpp b/source/object.cpp
index 7250caf8..e406755c 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -164,7 +164,7 @@ Object::Loader::~Loader()
 void Object::Loader::lod_mesh(unsigned l, const string &n)
 {
 	obj.meshes.resize(l+1, 0);
-	obj.meshes[l]=&coll.get<Mesh>(n);
+	obj.meshes[l]=coll.get<Mesh>(n);
 }
 
 void Object::Loader::material_inline()
@@ -178,7 +178,7 @@ void Object::Loader::material_inline()
 
 void Object::Loader::mesh(const string &n)
 {
-	obj.meshes[0]=&coll.get<Mesh>(n);
+	obj.meshes[0]=coll.get<Mesh>(n);
 }
 
 void Object::Loader::pass(const string &n)
@@ -192,7 +192,7 @@ void Object::Loader::pass(const string &n)
 
 void Object::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;
@@ -210,12 +210,12 @@ void Object::Loader::texture(const string &n)
 	unsigned eqsign=n.find('=');
 	if(eqsign!=string::npos)
 	{
-		obj.textures.push_back(&coll.get<Texture>(n.substr(eqsign+1)));
+		obj.textures.push_back(coll.get<Texture>(n.substr(eqsign+1)));
 		textures.push_back(n.substr(0, eqsign));
 	}
 	else
 	{
-		obj.textures.push_back(&coll.get<Texture>(n));
+		obj.textures.push_back(coll.get<Texture>(n));
 		textures.push_back(n);
 	}
 }
diff --git a/source/objectpass.cpp b/source/objectpass.cpp
index 57e7b278..153186d8 100644
--- a/source/objectpass.cpp
+++ b/source/objectpass.cpp
@@ -33,7 +33,7 @@ ObjectPass::Loader::Loader(ObjectPass &p, Collection &c):
 
 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;