Changeset 3790 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/material.h

Timestamp:

Apr 13, 2005, 12:33:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/src/lib/graphics/importer/material.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -22 +22 @@
 {
  public:
-  Material ();
-  Material (char* mtlName);
+  Material (char* mtlName = "");
   Material* addMaterial(char* mtlName);
   ~Material ();
-  void init(void);
 
   Material* search(char* mtlName);