diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/tools-properties/object3d-properties.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel')
-rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.js | 11 |
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 | |||
10 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | 10 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; |
11 | 11 | ||
12 | exports.Object3DProperties = Montage.create(ToolProperties, { | 12 | exports.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 () { |