Merge pull request #10672 from howard-stearns/fix-teleport-vs-stuck-in-floor

fix teleport vs stuck-in-floor work
This commit is contained in:
Chris Collins 2017-06-13 11:13:35 -07:00 committed by GitHub
commit 33bf8cc20e

View file

@ -605,7 +605,7 @@ bool RenderableModelEntityItem::findDetailedRayIntersection(const glm::vec3& ori
QString extraInfo; QString extraInfo;
return _model->findRayIntersectionAgainstSubMeshes(origin, direction, distance, return _model->findRayIntersectionAgainstSubMeshes(origin, direction, distance,
face, surfaceNormal, extraInfo, precisionPicking, precisionPicking); face, surfaceNormal, extraInfo, precisionPicking, false);
} }
void RenderableModelEntityItem::getCollisionGeometryResource() { void RenderableModelEntityItem::getCollisionGeometryResource() {