diff options
| author | Jose Antonio Marquez | 2012-04-11 11:06:40 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-11 11:06:40 -0700 |
| commit | 61ece4058e22ab8a9b1da0b00f4a38f7f74d57e4 (patch) | |
| tree | 9ebbe37bf22cb5280882a0ef5b95196fcf163251 /js/models | |
| parent | d14f78b06d37aa469885f2ecf84419bcb7e3e613 (diff) | |
| parent | 9d1c919a4865ab1a2b0b0b9fc893a54b145c82c0 (diff) | |
| download | ninja-61ece4058e22ab8a9b1da0b00f4a38f7f74d57e4.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/models')
| -rwxr-xr-x | js/models/properties-3d.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index 0a7cf8bb..c1270c3b 100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.js | |||
| @@ -67,10 +67,6 @@ exports.Properties3D = Montage.create(Component, { | |||
| 67 | this.matrix3d = Matrix.I(4); | 67 | this.matrix3d = Matrix.I(4); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | if(this.perspectiveDist == null) { | ||
| 71 | this.perspectiveDist = 1400; | ||
| 72 | } | ||
| 73 | |||
| 74 | return this; | 70 | return this; |
| 75 | } | 71 | } |
| 76 | }, | 72 | }, |
| @@ -94,7 +90,7 @@ exports.Properties3D = Montage.create(Component, { | |||
| 94 | ResetTranslationValues : { | 90 | ResetTranslationValues : { |
| 95 | value : function() { | 91 | value : function() { |
| 96 | // this.m_objStartPos = [0,0,0]; | 92 | // this.m_objStartPos = [0,0,0]; |
| 97 | this.perspectiveDist = 1400; | 93 | // this.perspectiveDist = 1400; |
| 98 | } | 94 | } |
| 99 | } | 95 | } |
| 100 | }); \ No newline at end of file | 96 | }); \ No newline at end of file |