Changeset 3914 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/model.cc

Timestamp:

Apr 21, 2005, 1:46:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: materialList is now a property of model not material, makes more sense

File:

• orxonox/trunk/src/lib/graphics/importer/model.cc (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -345 +345 @@
 }
 
+/**
+   \brief finds a Material by its name and returns it
+   \param materialName the Name of the material to search for.
+   \returns the Material if found, NULL otherwise
+*/
 Material* Model::findMaterialByName(const char* materialName)
 {
@@ -589 +594 @@
   this->initFace (this->currentGroup->currentFace);
   
-  this->currentGroup->currentFace->material = material->search(matString);
+  this->currentGroup->currentFace->material = this->findMaterialByName(matString);
 
   if (this->currentGroup->faceCount == 0)