Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-physics-crash' of github.com:sethalves/hifi into vhacd-knobs

Browse source
This commit is contained in:
Seth Alves 2015-03-30 16:02:27 -07:00
commit 4aa6748e11
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -282,7 +282,7 @@ bool RenderableModelEntityItem::hasCollisionModel() const {
} }
const QString& RenderableModelEntityItem::getCollisionModelURL() const { const QString& RenderableModelEntityItem::getCollisionModelURL() const {
assert (!_model || _collisionModelURL == _model->getCollisionURL().toString()); // assert (!_model || _collisionModelURL == _model->getCollisionURL().toString());
return _collisionModelURL; return _collisionModelURL;
} }

2
libraries/physics/src/PhysicsEngine.cpp
View file

@ -33,7 +33,7 @@ PhysicsEngine::~PhysicsEngine() {
delete _collisionDispatcher; delete _collisionDispatcher;
delete _broadphaseFilter; delete _broadphaseFilter;
delete _constraintSolver; delete _constraintSolver;
delete _dynamicsWorld; // delete _dynamicsWorld;
// delete _ghostPairCallback; // delete _ghostPairCallback;
} }