Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixing file

Browse source
This commit is contained in:
Sam Gateau 2015-05-09 11:48:30 -07:00
parent d51904b7b3
commit 23ef568269
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -167,12 +167,8 @@ VectorOfMotionStates& PhysicalEntitySimulation::getObjectsToAdd() {
_tempVector.push_back(motionState);
entityItr = _pendingAdds.erase(entityItr);
} else {
<<<<<<< HEAD
// qDebug() << "Warning! Failed to generate new shape for entity." << entity->getName();
=======
// TODO: Seth to look into why this case is hit.
//qDebug() << "Warning! Failed to generate new shape for entity." << entity->getName();
>>>>>>> 72e1ea688adad9914d9994b81a96225ac411ba83
++entityItr;
}
} else {