aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/shapes-controller.js
diff options
context:
space:
mode:
authorhwc4872012-02-06 13:09:32 -0800
committerhwc4872012-02-06 13:09:32 -0800
commit1a8c017e37c5c0dec445ebafad634ef997fcd1bb (patch)
tree3380cb8ef0636dc0f662a2903f759a41749c28e0 /js/controllers/elements/shapes-controller.js
parent465636cc0676d7fb83939d6fdb9204e474d47d46 (diff)
parent486d9a31a85dd833a1c798049a00403756703034 (diff)
downloadninja-1a8c017e37c5c0dec445ebafad634ef997fcd1bb.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rw-r--r--js/controllers/elements/shapes-controller.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 5efbccd0..48072309 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -76,6 +76,7 @@ exports.ShapesController = Montage.create(CanvasController, {
76 case "fillMaterial": 76 case "fillMaterial":
77 case "border": 77 case "border":
78 case "background": 78 case "background":
79 case "useWebGl":
79 return this.getShapeProperty(el, p); 80 return this.getShapeProperty(el, p);
80 default: 81 default:
81 return CanvasController.getProperty(el, p); 82 return CanvasController.getProperty(el, p);