Adapt to DataFile changes

diff --git a/source/object.cpp b/source/object.cpp
index 7250caf8f9bc22272c4e859882ee17229298f97a..e406755c1e81e2e1d27e5f77658c19d5034c6b21 100644 (file)
--- 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 57e7b278eca81597fc0502b35cc3a27a61bb699c..153186d8388583b8778621567097f87353aec582 100644 (file)
--- 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;