diff options
author | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
commit | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch) | |
tree | 657d55ad394de168dd627cf89b875906d10584e2 /js/helper-classes/3D/hit-record.js | |
parent | d764428023d87446fbbb153d8e04a23b900d71d5 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/helper-classes/3D/hit-record.js')
-rwxr-xr-x | js/helper-classes/3D/hit-record.js | 6 |
1 files changed, 2 insertions, 4 deletions
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, | |||
139 | 139 | ||
140 | isSomeGridTypeSnap : { | 140 | isSomeGridTypeSnap : { |
141 | value: function() { | 141 | value: function() { |
142 | return | 142 | return ((this._type == this.SNAP_TYPE_GRID_VERTEX) || |
143 | ( | ||
144 | (this._type == this.SNAP_TYPE_GRID_VERTEX) || | ||
145 | (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || | 143 | (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || |
146 | (this._type == this.SNAP_TYPE_GRID_VERTICAL) | 144 | (this._type == this.SNAP_TYPE_GRID_VERTICAL) |
147 | ) | 145 | ); |
148 | } | 146 | } |
149 | }, | 147 | }, |
150 | 148 | ||