diff options
author | Nivesh Rajbhandari | 2012-04-18 13:42:18 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-18 13:42:18 -0700 |
commit | 7b3ef287f248c07602aefa3ba2cc907e0d16493a (patch) | |
tree | fb098120c06002204b1c6edbfea1a0f4aeb45ac0 /js/helper-classes | |
parent | fb20a74856a8c272d09d106765eb2e44c883f0c3 (diff) | |
download | ninja-7b3ef287f248c07602aefa3ba2cc907e0d16493a.tar.gz |
Fixing some more merge issues.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index 42e0cfa9..039f5bb3 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -796,7 +796,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
796 | context.stroke(); | 796 | context.stroke(); |
797 | 797 | ||
798 | this._selectionCtr = MathUtils.getCenterFromBounds(3, bounds3D); | 798 | this._selectionCtr = MathUtils.getCenterFromBounds(3, bounds3D); |
799 | console.log("selection center, single elt case - ", this._selectionCtr); | 799 | // console.log("selection center, single elt case - ", this._selectionCtr); |
800 | 800 | ||
801 | this.viewUtils.popViewportObj(); | 801 | this.viewUtils.popViewportObj(); |
802 | } | 802 | } |
@@ -837,7 +837,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
837 | if (MathUtils.fpCmp(dot, 1) != 0) | 837 | if (MathUtils.fpCmp(dot, 1) != 0) |
838 | flat = false; | 838 | flat = false; |
839 | } | 839 | } |
840 | console.log( "drawSelectionBounds, flat: " + flat ); | 840 | // console.log( "drawSelectionBounds, flat: " + flat ); |
841 | 841 | ||
842 | // if all the elements share the same plane, draw the 2D rectangle | 842 | // if all the elements share the same plane, draw the 2D rectangle |
843 | if (flat) | 843 | if (flat) |