aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 13:14:47 -0800
committerJose Antonio Marquez2012-02-08 13:14:47 -0800
commit553e06c9e903e845cb9cd73971d59561fca375c7 (patch)
treeb85718d3c307c4693be75774ed68191bce9aebbf /js/models
parent4bfac53c9a77a3af35d029757eece53f4b7212ed (diff)
parent10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
downloadninja-553e06c9e903e845cb9cd73971d59561fca375c7.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/shape-model.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index b643a7b5..58a88fd0 100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage,
10exports.ShapeModel = Montage.create(Component, { 10exports.ShapeModel = Montage.create(Component, {
11 11
12 shapeCount: { value: 0 }, 12 shapeCount: { value: 0 },
13 useWebGl: { value: false },
13 14
14 GLWorld: { value: null }, 15 GLWorld: { value: null },
15 GLGeomObj: { value: null }, 16 GLGeomObj: { value: null },
@@ -17,14 +18,12 @@ exports.ShapeModel = Montage.create(Component, {
17 strokeSize: { value: null }, 18 strokeSize: { value: null },
18 stroke: { value: null }, 19 stroke: { value: null },
19 strokeMaterial: { value: null }, 20 strokeMaterial: { value: null },
20 strokeMaterialIndex: { value: null },
21 strokeStyle: { value: null }, 21 strokeStyle: { value: null },
22 strokeStyleIndex: { value: null }, 22 strokeStyleIndex: { value: null },
23 border: { value: null }, // Store css value for ColorController 23 border: { value: null }, // Store css value for ColorController
24 24
25 fill: { value: null }, 25 fill: { value: null },
26 fillMaterial: { value: null }, 26 fillMaterial: { value: null },
27 fillMaterialIndex: { value: null },
28 background: { value: null }, // Store css value for ColorController 27 background: { value: null }, // Store css value for ColorController
29 28
30 // Line-specific 29 // Line-specific