Merge pull request #4033 from ZappoMan/bugFix

remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
This commit is contained in:
Philip Rosedale 2015-01-02 16:13:58 -08:00
commit 9837521fc6

View file

@ -590,7 +590,6 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) {
bool calculatedMeshTrianglesNeeded = pickAgainstTriangles && !_calculatedMeshTrianglesValid;
if (!_calculatedMeshBoxesValid || calculatedMeshTrianglesNeeded) {
PerformanceTimer perfTimer("calculatedMeshBoxes");
const FBXGeometry& geometry = _geometry->getFBXGeometry();
int numberOfMeshes = geometry.meshes.size();
_calculatedMeshBoxes.resize(numberOfMeshes);