diff options
author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a /js/stage/stage.reel | |
parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index dd23fbae..ec8c0e55 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -560,8 +560,7 @@ exports.Stage = Montage.create(Component, { | |||
560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
561 | 561 | ||
562 | // workaround Chrome 3d bug | 562 | // workaround Chrome 3d bug |
563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) | 563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) { |
564 | { | ||
565 | return this._getElementUsingSnapping(point); | 564 | return this._getElementUsingSnapping(point); |
566 | } else { | 565 | } else { |
567 | return elt; | 566 | return elt; |
@@ -605,7 +604,7 @@ exports.Stage = Montage.create(Component, { | |||
605 | var selArray = new Array(); | 604 | var selArray = new Array(); |
606 | 605 | ||
607 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { | 606 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { |
608 | var curElement = this.application.ninja.selectedElements[i]._element; | 607 | var curElement = this.application.ninja.selectedElements[i]; |
609 | 608 | ||
610 | // Add element to array that is used to calculate 3d-bounding box of all elements | 609 | // Add element to array that is used to calculate 3d-bounding box of all elements |
611 | selArray.push( curElement ); | 610 | selArray.push( curElement ); |