Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/asefile.cc')
-rw-r--r--src/model/asefile.cc14
1 files changed, 2 insertions, 12 deletions
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;
}