diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/helper-classes/3D/snap-manager.js | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 7fc492a5..31e3e540 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
| @@ -1617,7 +1617,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1617 | if (x > y) { | 1617 | if (x > y) { |
| 1618 | if (x > z) { | 1618 | if (x > z) { |
| 1619 | plane[0] = 1; | 1619 | plane[0] = 1; |
| 1620 | plane[3] = this.getStageWidth() / 2.0; | 1620 | plane[3] = this.getStageWidth() / 2.0; |
| 1621 | if (dir[0] > 0) plane[3] = -plane[3]; | 1621 | if (dir[0] > 0) plane[3] = -plane[3]; |
| 1622 | change = !drawUtils.drawYZ; | 1622 | change = !drawUtils.drawYZ; |
| 1623 | drawUtils.drawXY = drawUtils.drawXZ = false; | 1623 | drawUtils.drawXY = drawUtils.drawXZ = false; |
| @@ -1635,7 +1635,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1635 | else { | 1635 | else { |
| 1636 | if (y > z) { | 1636 | if (y > z) { |
| 1637 | plane[1] = 1; | 1637 | plane[1] = 1; |
| 1638 | plane[3] = this.getStageHeight() / 2.0; | 1638 | plane[3] = this.getStageHeight() / 2.0; |
| 1639 | if (dir[1] > 0) plane[3] = -plane[3]; | 1639 | if (dir[1] > 0) plane[3] = -plane[3]; |
| 1640 | change = !drawUtils.drawXZ; | 1640 | change = !drawUtils.drawXZ; |
| 1641 | drawUtils.drawXY = drawUtils.drawYZ = false; | 1641 | drawUtils.drawXY = drawUtils.drawYZ = false; |