mspdatafile APIs have changed slightly

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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 93538d48d64e013f948c33cee22eee989adc0c3b..fc2d37ed1a72d6a6a46335f50b46db09bd96bd6a 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
 #include <msp/strings/format.h>
 #include "error.h"
@@ -74,8 +73,6 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 
 void RenderPass::Loader::init()
 {
-       allow_pointer_reload = false;
-
        add("shader",   &RenderPass::shprog);
        add("material", &Loader::material_inline);
        add("material", &Loader::material);
@@ -93,7 +90,7 @@ void RenderPass::Loader::material_inline()
 
 void RenderPass::Loader::material(const string &name)
 {
-       obj.material = get_collection().get<Material>(name);
+       obj.material = &get_collection().get<Material>(name);
        obj.material.keep();
 }
 
@@ -151,7 +148,7 @@ void RenderPass::TextureLoader::texenv()
 
 void RenderPass::TextureLoader::texture(const string &name)
 {
-       tex = get_collection().get<Texture>(name);
+       tex = &get_collection().get<Texture>(name);
        tex.keep();
 }