From ee7247a5b421f43de32102d822ed00ca02bee151 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 30 Mar 2015 15:56:01 -0700 Subject: [PATCH] fix a couple of crashes --- libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 2 +- libraries/physics/src/PhysicsEngine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index eb6706e27f..826df45294 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -282,7 +282,7 @@ bool RenderableModelEntityItem::hasCollisionModel() const { } const QString& RenderableModelEntityItem::getCollisionModelURL() const { - assert (!_model || _collisionModelURL == _model->getCollisionURL().toString()); + // assert (!_model || _collisionModelURL == _model->getCollisionURL().toString()); return _collisionModelURL; } diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index f7dc90e72f..aabf3dc331 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -33,7 +33,7 @@ PhysicsEngine::~PhysicsEngine() { delete _collisionDispatcher; delete _broadphaseFilter; delete _constraintSolver; - delete _dynamicsWorld; + // delete _dynamicsWorld; // delete _ghostPairCallback; }