aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorhwc4872012-01-31 10:46:48 -0800
committerhwc4872012-01-31 10:46:48 -0800
commitaa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260 (patch)
tree9fd0364c371b8c9bbe1620b9a5a58a45dd0574a9 /js/mediators
parent0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (diff)
parent6066b9bda2990c9d6b4311d221b0d0c773b20f60 (diff)
downloadninja-aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts: js/stage/stage.reel/stage.js
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/element-mediator.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 91b09475..a6f31703 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -92,6 +92,11 @@ exports.ElementMediator = Montage.create(NJComponent, {
92 _addElement: { 92 _addElement: {
93 value: function(el, rules, noEvent) { 93 value: function(el, rules, noEvent) {
94 ElementController.addElement(el, rules); 94 ElementController.addElement(el, rules);
95 var p3d = this.get3DProperties(el);
96 if(p3d)
97 {
98 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
99 }
95 if(!noEvent) NJevent("elementAdded", el); 100 if(!noEvent) NJevent("elementAdded", el);
96 } 101 }
97 }, 102 },