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

Timestamp:

Apr 21, 2005, 1:59:59 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: material is now only dependent on tList<Material>* in model

File:

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

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

@@ -48 +48 @@
   this->initGroup (this->currentGroup);
   this->scaleFactor = 1;
-  this->material = new Material();
 
   this->vertices = new Array();
@@ -83 +82 @@
     }
 
+  // deleting the MaterialList
   PRINTF(5)("Deleting Materials.\n");
-  if (this->material)
-    delete this->material;
-
-  // deleting the MaterialList
+
+  tIterator<Material>* tmpIt = this->materialList->getIterator();
+  Material* material = tmpIt->nextElement();
+  while(material)
+    {
+      delete material;
+      material = tmpIt->nextElement();
+    }
+  delete tmpIt;
   delete materialList;
 }