X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=71610c7cd9174957e0bf650f5f50631c2812ddb7;hp=b7dd767eaff72dd309f5cb6adc4f4d211cfed4e5;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hpb=23d4100160bfa33359ce297b6b36244abcaa5f82 diff --git a/source/materials/material.cpp b/source/materials/material.cpp index b7dd767e..71610c7c 100644 --- a/source/materials/material.cpp +++ b/source/materials/material.cpp @@ -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;