aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/line-properties.reel
diff options
context:
space:
mode:
authorhwc4872012-02-07 14:42:51 -0800
committerhwc4872012-02-07 14:42:51 -0800
commit6173fe8440152b1e4c63834a6b4dc7573d532339 (patch)
treed23449204ae7f23cb9bab09836d126e90c30484b /js/components/tools-properties/line-properties.reel
parent2d4da18a778471b02e188ad668752e331ee76127 (diff)
parentaec849d91e4b697d496b9ede28b5d89cf2283781 (diff)
downloadninja-6173fe8440152b1e4c63834a6b4dc7573d532339.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to 'js/components/tools-properties/line-properties.reel')
-rw-r--r--js/components/tools-properties/line-properties.reel/line-properties.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js
index 694e4326..e1ecf790 100644
--- a/js/components/tools-properties/line-properties.reel/line-properties.js
+++ b/js/components/tools-properties/line-properties.reel/line-properties.js
@@ -33,18 +33,24 @@ exports.LineProperties = Montage.create(ToolProperties, {
33 }, 33 },
34 34
35 strokeStyle : { 35 strokeStyle : {
36 get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].text; } 36 get: function() {
37// return this.base._strokeStyle.options[this.base._strokeStyle.value].text;
38 return "Solid";
39 }
37 }, 40 },
38 41
39 strokeStyleIndex : { 42 strokeStyleIndex : {
40 get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].value; } 43 get: function() {
44// return this.base._strokeStyle.options[this.base._strokeStyle.value].value;
45 return 1;
46 }
41 }, 47 },
42 48
43 strokeMaterial: { 49 strokeMaterial: {
44 get: function() { return this.base._strokeMaterial.options[this.base._strokeMaterial.value].value; } 50 get: function() { return this.base._strokeMaterial.value; }
45 }, 51 },
46 52
47 fillMaterial: { 53 fillMaterial: {
48 get: function() { return this.base._fillMaterial.options[this.base._fillMaterial.value].value; } 54 get: function() { return this.base._fillMaterial.value; }
49 } 55 }
50}); \ No newline at end of file 56}); \ No newline at end of file