Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess

This commit is contained in:
Atlante45 2015-01-20 00:32:32 -08:00
commit 75ce99cd62

View file

@ -66,7 +66,7 @@ void PhysicsEngine::addEntityInternal(EntityItem* entity) {
_entityMotionStates.insert(motionState);
} else {
// We failed to add the entity to the simulation. Probably because we couldn't create a shape for it.
qDebug() << "failed to add entity " << entity->getEntityItemID() << " to physics engine";
//qDebug() << "failed to add entity " << entity->getEntityItemID() << " to physics engine";
delete motionState;
}
}