From 8a2f1bc056861bb2000f74ffa9cf48433f201576 Mon Sep 17 00:00:00 2001
From: Jordi <jtorresfabra@gmail.com>
Date: Wed, 31 May 2017 13:30:50 +0200
Subject: [PATCH] Fixes kdtree building

---
 src/osg/KdTree.cpp                     |  2 --
 src/osgUtil/LineSegmentIntersector.cpp | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/osg/KdTree.cpp b/src/osg/KdTree.cpp
index 32c12eb00..eeadfb816 100644
--- a/src/osg/KdTree.cpp
+++ b/src/osg/KdTree.cpp
@@ -361,8 +361,6 @@ int BuildKdTree::divide(KdTree::BuildOptions& options, osg::BoundingBox& bb, int
 
                 while(left<right && (_centers[_primitiveIndices[right]][axis]>mid)) { --right; }
 
-                while(left<right && (_centers[_primitiveIndices[right]][axis]>mid)) { --right; }
-
                 if (left<right)
                 {
                     std::swap(_primitiveIndices[left], _primitiveIndices[right]);
diff --git a/src/osgUtil/LineSegmentIntersector.cpp b/src/osgUtil/LineSegmentIntersector.cpp
index f742a288f..22dd74d2c 100644
--- a/src/osgUtil/LineSegmentIntersector.cpp
+++ b/src/osgUtil/LineSegmentIntersector.cpp
@@ -141,7 +141,7 @@ struct IntersectFunctor
             }
         }
 
-        // compate s and e against the yMin to yMax range of bb.
+        // compare s and e against the yMin to yMax range of bb.
         if (s.y()<=e.y())
         {
 
@@ -179,7 +179,7 @@ struct IntersectFunctor
             }
         }
 
-        // compate s and e against the zMin to zMax range of bb.
+        // compare s and e against the zMin to zMax range of bb.
         if (s.z()<=e.z())
         {
 
@@ -247,8 +247,8 @@ struct IntersectFunctor
 
         value_type r,r0,r1,r2;
 
-        const value_type esplison = 1e-10;
-        if (det>esplison)
+        const value_type epsilon = 1e-10;
+        if (det>epsilon)
         {
             value_type u = (P*T);
             if (u<0.0 || u>det) return;
@@ -271,7 +271,7 @@ struct IntersectFunctor
             r2 = v;
             r = t * _inverse_length;
         }
-        else if (det<-esplison)
+        else if (det<-epsilon)
         {
             value_type u = (P*T);
             if (u>0.0 || u<det) return;
@@ -595,7 +595,7 @@ bool LineSegmentIntersector::intersectAndClip(osg::Vec3d& s, osg::Vec3d& e,const
 
     double epsilon = 1e-5;
 
-    // compate s and e against the xMin to xMax range of bb.
+    // compare s and e against the xMin to xMax range of bb.
     if (s.x()<=e.x())
     {
         // trivial reject of segment wholely outside.
@@ -636,7 +636,7 @@ bool LineSegmentIntersector::intersectAndClip(osg::Vec3d& s, osg::Vec3d& e,const
         }
     }
 
-    // compate s and e against the yMin to yMax range of bb.
+    // compare s and e against the yMin to yMax range of bb.
     if (s.y()<=e.y())
     {
         // trivial reject of segment wholely outside.
@@ -677,7 +677,7 @@ bool LineSegmentIntersector::intersectAndClip(osg::Vec3d& s, osg::Vec3d& e,const
         }
     }
 
-    // compate s and e against the zMin to zMax range of bb.
+    // compare s and e against the zMin to zMax range of bb.
     if (s.z()<=e.z())
     {
         // trivial reject of segment wholely outside.