diff options
| author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
| commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
| tree | 6b48b82604e194016ca048ad912f8015de719999 /js/models/shape-model.js | |
| parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/models/shape-model.js')
| -rwxr-xr-x | js/models/shape-model.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js index 58a88fd0..ea8c2cfc 100755 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js | |||
| @@ -10,7 +10,8 @@ var Montage = require("montage/core/core").Montage, | |||
| 10 | exports.ShapeModel = Montage.create(Component, { | 10 | exports.ShapeModel = Montage.create(Component, { |
| 11 | 11 | ||
| 12 | shapeCount: { value: 0 }, | 12 | shapeCount: { value: 0 }, |
| 13 | useWebGl: { value: false }, | 13 | useWebGl: { value: false }, |
| 14 | animate: { value: true }, | ||
| 14 | 15 | ||
| 15 | GLWorld: { value: null }, | 16 | GLWorld: { value: null }, |
| 16 | GLGeomObj: { value: null }, | 17 | GLGeomObj: { value: null }, |