aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/object3d-properties.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/tools-properties/object3d-properties.reel
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel')
-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 () {