Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/importer/objModel.h

    r4468 r6022  
    77#define _OBJMODEL_H
    88
    9 #include "model.h"
     9#include "static_model.h"
    1010
    1111//! A Class, that handles the parsing of an obj-file, and inclusion as a Model.
    12 class OBJModel : public Model
     12class OBJModel : public StaticModel
    1313{
    1414 public:
Note: See TracChangeset for help on using the changeset viewer.