Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

1 files changed, 2 insertions, 2 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 9fc9b576..e62af921 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -166,10 +166,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     }
                     break;
                 case "editStrokeMaterial":
-                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial")});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial"),  useSelection: true,  whichMaterial: 'stroke'});
                     break;
                 case "editFillMaterial":
-                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial")});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial"),  useSelection: true,  whichMaterial: 'fill'});
                     break;
                 case "animate":
                     if(value)