aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/elements/shapes-controller.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 21373aca..c6722dee 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -108,7 +108,15 @@ exports.ShapesController = Montage.create(CanvasController, {
108 return this.getShapeProperty(el, p); 108 return this.getShapeProperty(el, p);
109 case "strokeMaterial": 109 case "strokeMaterial":
110 case "fillMaterial": 110 case "fillMaterial":
111 return this.getShapeProperty(el, p).getName(); 111 var m = this.getShapeProperty(el, p);
112 if(m)
113 {
114 return this.getShapeProperty(el, p).getName();
115 }
116 else
117 {
118 return "FlatMaterial";
119 }
112 default: 120 default:
113 return CanvasController.getProperty(el, p); 121 return CanvasController.getProperty(el, p);
114 } 122 }