diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/components/tools-properties/object3d-properties.reel/object3d-properties.js | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.js')
-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 () { |