Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 19, 2005, 4:52:01 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/static_model.cc

    r6072 r6162  
    144144StaticModel::StaticModel(const char* modelName)
    145145{
    146   this->setClassID(CL_MODEL, "Model");
     146  this->setClassID(CL_STATIC_MODEL, "StaticModel");
    147147  PRINTF(4)("new 3D-Model is being created\n");
    148148  this->setName(modelName);
     
    550550      this->currentGroup->currentFace->vertexCount++;
    551551    }
    552  
     552
    553553  this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
    554554  this->faceCount += this->currentGroup->currentFace->vertexCount -2;
Note: See TracChangeset for help on using the changeset viewer.