Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 5 insertions, 0 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 7c5c161c..1d0aef44 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -92,6 +92,11 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _addElement: {
         value: function(el, rules, noEvent) {
             ElementController.addElement(el, rules);
+            var p3d = this.get3DProperties(el);
+            if(p3d)
+            {
+                el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
+            }
             if(!noEvent) NJevent("elementAdded", el);
         }
     },