diff options
| author | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
| commit | 5e8faa47e1b2507a09d04fea4325006e5eab2f25 (patch) | |
| tree | 56683c1be0485f560ff49e8125f0b19dd42199f3 /js/lib/drawing | |
| parent | 2946d01666ff81f913bd06d1ac1381ed42b4a010 (diff) | |
| parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
| download | ninja-5e8faa47e1b2507a09d04fea4325006e5eab2f25.tar.gz | |
Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox
Diffstat (limited to 'js/lib/drawing')
| -rwxr-xr-x | js/lib/drawing/world.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index fb787256..fd833e4b 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
| @@ -732,6 +732,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) { | |||
| 732 | } | 732 | } |
| 733 | }; | 733 | }; |
| 734 | 734 | ||
| 735 | |||
| 736 | |||
| 735 | World.prototype.exportJSON = function() | 737 | World.prototype.exportJSON = function() |
| 736 | { | 738 | { |
| 737 | // world properties | 739 | // world properties |