Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-05-06 17:08:21 +0000
committerStijn Buys <ingar@osirion.org>2011-05-06 17:08:21 +0000
commite7a0b54c4717afdfa12a8847d5bc72b7b68290b4 (patch)
tree015dc7cc0f75c4405f5d07e137533d5dbc761598 /src/model/collisionmodel.cc
parentebe064bf159a5c6e90f2bbe902efa16c6e654ff8 (diff)
Import submodel clip
Diffstat (limited to 'src/model/collisionmodel.cc')
-rw-r--r--src/model/collisionmodel.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/model/collisionmodel.cc b/src/model/collisionmodel.cc
index d52c9bc..fd2f67b 100644
--- a/src/model/collisionmodel.cc
+++ b/src/model/collisionmodel.cc
@@ -17,8 +17,9 @@ CollisionModel::CollisionModel(const std::string & label) :
CollisionModel::~CollisionModel()
{
- // clear the list of meshes, do not delete the meshes
+ // delete meshes
for (CollisionMeshes::iterator it = collisionmodel_meshes.begin(); it != collisionmodel_meshes.end(); it++) {
+ delete (*it);
(*it) = 0;
}
collisionmodel_meshes.clear();
@@ -35,14 +36,12 @@ CollisionModel::Registry CollisionModel::collisionmodel_registry;
void CollisionModel::init()
{
- CollisionMesh::init();
clear();
}
void CollisionModel::shutdown()
{
clear();
- CollisionMesh::shutdown();
}
CollisionModel *CollisionModel::find(const std::string & label)