aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 13:14:29 -0800
committerJose Antonio Marquez2012-02-08 13:14:29 -0800
commit9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch)
treee7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/models
parentaa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
downloadninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/models')
-rw-r--r--js/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 100644
--- 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