aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/tools-properties/object3d-properties.reel/object3d-properties.js
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.js')
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
index d7f0976c..33ef3394 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -10,8 +10,15 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
11 11
12exports.Object3DProperties = Montage.create(ToolProperties, { 12exports.Object3DProperties = Montage.create(ToolProperties, {
13 rotateLocally: { value: null, enumerable: false }, 13 rotateLocally: {
14 rotateGlobally: { value: null, enumerable: false }, 14 value: null,
15 serializable: true
16 },
17
18 rotateGlobally: {
19 value: null,
20 serializable: true
21 },
15 22
16 _subPrepare: { 23 _subPrepare: {
17 value: function () { 24 value: function () {