diff options
author | Jon Reid | 2012-04-10 14:52:23 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/models/shape-model.js | |
parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/models/shape-model.js')
-rwxr-xr-x | js/models/shape-model.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js index ea8c2cfc..ff69ae3c 100755 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js | |||
@@ -17,15 +17,8 @@ exports.ShapeModel = Montage.create(Component, { | |||
17 | GLGeomObj: { value: null }, | 17 | GLGeomObj: { value: null }, |
18 | 18 | ||
19 | strokeSize: { value: null }, | 19 | strokeSize: { value: null }, |
20 | stroke: { value: null }, | ||
21 | strokeMaterial: { value: null }, | ||
22 | strokeStyle: { value: null }, | 20 | strokeStyle: { value: null }, |
23 | strokeStyleIndex: { value: null }, | 21 | strokeStyleIndex: { value: null }, |
24 | border: { value: null }, // Store css value for ColorController | ||
25 | |||
26 | fill: { value: null }, | ||
27 | fillMaterial: { value: null }, | ||
28 | background: { value: null }, // Store css value for ColorController | ||
29 | 22 | ||
30 | // Line-specific | 23 | // Line-specific |
31 | slope: { value: null }, | 24 | slope: { value: null }, |