X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=b7dd767eaff72dd309f5cb6adc4f4d211cfed4e5;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=d03a72a53eaca89a5debb1ccace6a6054c80e504;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index d03a72a5..b7dd767e 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,10 +1,9 @@
 #include <msp/core/hash.h>
 #include <msp/strings/format.h>
 #include "basicmaterial.h"
-#include "gl.h"
 #include "pbrmaterial.h"
+#include "program.h"
 #include "resources.h"
-#include "uniform.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -91,14 +90,20 @@ void Material::Loader::sampler(const string &name)
 
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-	coll(c),
+Material::GenericLoader::GenericLoader():
+	coll(0),
 	material(0),
 	mat_loader(0)
 {
 	set_actions(shared_actions);
 }
 
+Material::GenericLoader::GenericLoader(DataFile::Collection &c):
+	GenericLoader()
+{
+	coll = &c;
+}
+
 Material::GenericLoader::~GenericLoader()
 {
 	delete material;