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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index d03a72a5..71610c7c 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;
@@ -70,10 +69,6 @@ Material::MaterialRegistry &Material::get_material_registry()
 }
 
 
-Material::Loader::Loader(Material &m):
-	CollectionObjectLoader(m, 0)
-{ }
-
 Material::Loader::Loader(Material &m, Collection &c):
 	CollectionObjectLoader(m, &c)
 { }
@@ -91,7 +86,7 @@ void Material::Loader::sampler(const string &name)
 
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
+Material::GenericLoader::GenericLoader(DataFile::Collection &c):
 	coll(c),
 	material(0),
 	mat_loader(0)