diff options
| author | Jose Antonio Marquez | 2012-03-23 13:23:12 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-23 13:23:12 -0700 |
| commit | 67aaba2e752ea1964356f487269cafc686abb9a7 (patch) | |
| tree | c3794257facf5992aff796b1ef11ae661b2aa3cb /js/models | |
| parent | 7e61ce5aba0c8465595804da21e365baf4d8c15d (diff) | |
| parent | 3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859 (diff) | |
| download | ninja-67aaba2e752ea1964356f487269cafc686abb9a7.tar.gz | |
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
Diffstat (limited to 'js/models')
| -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 }, |