Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity

This commit is contained in:
Seth Alves 2015-03-18 13:44:12 -07:00
commit feeabc7bc8

View file

@ -63,7 +63,6 @@ void PhysicsEngine::addEntityInternal(EntityItem* entity) {
assert(entity);
void* physicsInfo = entity->getPhysicsInfo();
if (!physicsInfo) {
qDebug() << "PhysicsEngine::addEntityInternal(" << entity;
if (entity->isReadyToComputeShape()) {
ShapeInfo shapeInfo;
entity->computeShapeInfo(shapeInfo);