diff options
| author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
| commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
| tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /js/models/shape-model.js | |
| parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 }, |