Supporting switching materials in the PI. Also, moved makeFillMaterial and makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

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, {
                     return this.getShapeProperty(el, p);
                 case "strokeMaterial":
                 case "fillMaterial":
-                    return this.getShapeProperty(el, p).getName();
+                    var m = this.getShapeProperty(el, p);
+                    if(m)
+                    {
+                        return this.getShapeProperty(el, p).getName();
+                    }
+                    else
+                    {
+                        return "FlatMaterial";
+                    }
                 default:
                     return CanvasController.getProperty(el, p);
             }