From 1d518a54914531d7a4fab3a6835b75de85bd7bc7 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 9 Jul 2014 19:18:31 +0000 Subject: Initial support for multi-layered materials, requires shaders files in the new format. --- src/model/asefile.cc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/model/asefile.cc') diff --git a/src/model/asefile.cc b/src/model/asefile.cc index ffc0e9d..90bd6f2 100644 --- a/src/model/asefile.cc +++ b/src/model/asefile.cc @@ -112,12 +112,7 @@ Material *ASEFile::read_submaterial(std::istream &is) n += c; // find material - material = Material::find(n); - if (!material) { - material = new Material(n); - Material::add(material); - material->set_texture(material->name()); - } + material = Material::load(n); } else { do { @@ -187,12 +182,7 @@ ASEFile::SubMaterialList *ASEFile::read_material(std::istream &is) if (materialname.size()) { // no submaterials, add a single material to the submaterial list - Material *material = Material::find(materialname); - if (!material) { - material = new Material(materialname); - Material::add(material); - material->set_texture(materialname); - } + Material *material = Material::load(materialname); (*submaterials)[0] = material; } -- cgit v1.2.3