Merge remote-tracking branch 'ninja-internal/master' into Timeline-local

2 files changed, 2 insertions, 7 deletions

diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index e075dd3d..cb172bf7 100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.js
@@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
         setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
         getDeltaVis: { value: function()        {  return this._deltaVis;       } },
 
-        getElementPlanes: { value: function()           {  return this._deltaVis;               } },
-        setElementPlanes: { value: function(p)          {  this._elementPlanes = p;             } },
-
         setNext: { value: function(n)           {  this._next = n;                              } },
         getNext: { value: function()            {  return this._next;                   } },
 
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 5546cc5a..2c60adc6 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
 
         isSomeGridTypeSnap : {
         value: function() {
-            return
-            (
-                (this._type == this.SNAP_TYPE_GRID_VERTEX) ||
+            return ((this._type == this.SNAP_TYPE_GRID_VERTEX) ||
                     (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) ||
                     (this._type == this.SNAP_TYPE_GRID_VERTICAL)
-            )
+                   );
         }
     },