diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/tools-properties/object3d-properties.reel/object3d-properties.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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 () { |