History

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

Andrzej Kapolka committed 12 years ago

Commit 07efda82 parents bfaac9e 896cb7051 files · +1659 −803Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 51 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+3−3
@@ -2319,9 +2319,9 @@ void StaticModelRenderer::renderUnclipped(float alpha, Mode mode) { · 2318 unmodified lines
2319 _model->render(alpha);2319 _model->render(alpha);
2320}2320}
2321 2321
2322bool StaticModelRenderer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,2322bool StaticModelRenderer::findRayIntersection(RayIntersectionInfo& intersection,
2323 const glm::vec3& clipMinimum, float clipSize, float& distance) const {2323 const glm::vec3& clipMinimum, float clipSize) const {
2324 return _model->findRayIntersection(origin, direction, distance);2324 return _model->findRayIntersection(intersection);
2325}2325}
2326 2326
2327void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {2327void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {