mspdatafile APIs have changed slightly

[libs/gl.git] / source / technique.cpp

diff --git a/source/technique.cpp b/source/technique.cpp
index b809abdebb69fdcf4d1a015473285713d5c297f6..fcb2ffe58358c1ca65d57498a8050fb2c8e27cb6 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -49,7 +49,7 @@ void Technique::Loader::init()
 
 void Technique::Loader::inherit(const string &n)
 {
-       obj.passes = get_collection().get<Technique>(n)->get_passes();
+       obj.passes = get_collection().get<Technique>(n).get_passes();
        InheritLoader ldr(obj, get_collection());
        load_sub_with(ldr);
 }
@@ -74,13 +74,13 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 
 void Technique::InheritLoader::texture(const std::string &slot, const string &name)
 {
-       Texture *tex = get_collection().get<Texture>(name);
+       Texture &tex = get_collection().get<Texture>(name);
        for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
        {
                int index = i->second.get_texture_index(slot);
                if(index<0)
                        continue;
-               i->second.set_texture(index, tex);
+               i->second.set_texture(index, &tex);
        }
 }