]> git.tdb.fi Git - libs/gl.git/blobdiff - source/materials/material.cpp
Remove collection-less constructor overloads from most loaders
[libs/gl.git] / source / materials / material.cpp
index b7dd767eaff72dd309f5cb6adc4f4d211cfed4e5..71610c7cd9174957e0bf650f5f50631c2812ddb7 100644 (file)
@@ -69,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)
 { }
@@ -90,20 +86,14 @@ void Material::Loader::sampler(const string &name)
 
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-Material::GenericLoader::GenericLoader():
-       coll(0),
+Material::GenericLoader::GenericLoader(DataFile::Collection &c):
+       coll(c),
        material(0),
        mat_loader(0)
 {
        set_actions(shared_actions);
 }
 
-Material::GenericLoader::GenericLoader(DataFile::Collection &c):
-       GenericLoader()
-{
-       coll = &c;
-}
-
 Material::GenericLoader::~GenericLoader()
 {
        delete material;