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