Changeset 6022 in orxonox.OLD for trunk/src/lib/graphics/importer/objModel.cc

Timestamp:

Dec 10, 2005, 8:33:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the NewModel branche back to the trunk.
merged with command
svn merge branches/newModel/ trunk/ -r 6016:HEAD
no conflicts

File:

• trunk/src/lib/graphics/importer/objModel.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/objModel.cc

@@ -32 +32 @@
  * @param scaling The factor that the model will be scaled with.
 */
-OBJModel::OBJModel(const char* fileName, float scaling) : Model(fileName)
+OBJModel::OBJModel(const char* fileName, float scaling) : StaticModel(fileName)
 {
   this->objPath = "./";