diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /js/tools/TranslateObject3DTool.js | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'js/tools/TranslateObject3DTool.js')
| -rwxr-xr-x | js/tools/TranslateObject3DTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index 74df6c14..72a55322 100755 --- a/js/tools/TranslateObject3DTool.js +++ b/js/tools/TranslateObject3DTool.js | |||
| @@ -9,6 +9,7 @@ var Montage = require("montage/core/core").Montage, | |||
| 9 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, | 9 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, |
| 10 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, | 10 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, |
| 11 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, | 11 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, |
| 12 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, | ||
| 12 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 13 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; |
| 13 | 14 | ||
| 14 | exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | 15 | exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { |