Merge branch 'master' of git://github.com/siana/SingularityViewer.git

This commit is contained in:
Shyotl
2011-03-02 21:23:10 -06:00
39 changed files with 2633 additions and 1086 deletions

View File

@@ -2057,7 +2057,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
if (face == -1)
{
start_face = 0;
end_face = volume->getNumFaces();
end_face = volume->getNumVolumeFaces();
}
else
{