diff options
| author | hwc487 | 2012-03-23 13:49:03 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-23 13:49:03 -0700 |
| commit | 51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch) | |
| tree | 1524c53d027d1f2f8cbb759f61e4d73b52b00481 /js/models | |
| parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
| parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
| download | ninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz | |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/io/system/ninjalibrary.json
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 }, |