diff options
| author | hwc487 | 2012-03-24 14:07:58 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-24 14:07:58 -0700 |
| commit | cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch) | |
| tree | 4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /js/models | |
| parent | 62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff) | |
| parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
| download | ninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz | |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
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 }, |