1 files changed, 9 insertions, 6 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index d62fa1f8..a2440fb4 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -90,9 +90,12 @@ 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);
+//            var p3d = this.get3DProperties(el);
+//            if(p3d) {
+//                el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
+//            }
+            if(el.elementModel && el.elementModel.props3D) {
+                el.elementModel.props3D.init(el, false);
             }
             if(!noEvent) {
                 this.application.ninja.documentController.activeDocument.needsSave = true;
@@ -670,17 +673,17 @@ exports.ElementMediator = Montage.create(NJComponent, {
     },
 
     setMatrix: {
-        value: function(el, mat, isChanging) {
+        value: function(el, mat, isChanging, source) {
             var dist = el.elementModel.controller["getPerspectiveDist"](el);
             el.elementModel.controller["set3DProperties"](el, [{mat:mat, dist:dist}], 0, !isChanging);
 
             if(isChanging)
             {
-                NJevent("elementChanging", {type : "setMatrix", source: null, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
+                NJevent("elementChanging", {type : "setMatrix", source: source, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
             }
             else
             {
-                NJevent("elementChange", {type : "setMatrix", source: null, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
+                NJevent("elementChange", {type : "setMatrix", source: source, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
             }
         }
     },