diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /js/panels/properties/sections/three-d-view.reel/three-d-view.html | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/panels/properties/sections/three-d-view.reel/three-d-view.html')
| -rw-r--r-- | js/panels/properties/sections/three-d-view.reel/three-d-view.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html index 1e24cb55..11a5b3f2 100644 --- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html | |||
| @@ -39,7 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 39 | "value": { | 39 | "value": { |
| 40 | "boundObject": {"@": "owner"}, | 40 | "boundObject": {"@": "owner"}, |
| 41 | "boundObjectPropertyPath": "x3D", | 41 | "boundObjectPropertyPath": "x3D", |
| 42 | "oneway": false | 42 | "oneway": true |
| 43 | } | 43 | } |
| 44 | }, | 44 | }, |
| 45 | "listeners": [ | 45 | "listeners": [ |
| @@ -68,7 +68,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 68 | "value": { | 68 | "value": { |
| 69 | "boundObject": {"@": "owner"}, | 69 | "boundObject": {"@": "owner"}, |
| 70 | "boundObjectPropertyPath": "y3D", | 70 | "boundObjectPropertyPath": "y3D", |
| 71 | "oneway": false | 71 | "oneway": true |
| 72 | } | 72 | } |
| 73 | }, | 73 | }, |
| 74 | "listeners": [ | 74 | "listeners": [ |
| @@ -97,7 +97,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 97 | "value": { | 97 | "value": { |
| 98 | "boundObject": {"@": "owner"}, | 98 | "boundObject": {"@": "owner"}, |
| 99 | "boundObjectPropertyPath": "z3D", | 99 | "boundObjectPropertyPath": "z3D", |
| 100 | "oneway": false | 100 | "oneway": true |
| 101 | } | 101 | } |
| 102 | }, | 102 | }, |
| 103 | "listeners": [ | 103 | "listeners": [ |
| @@ -128,7 +128,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 128 | "value": { | 128 | "value": { |
| 129 | "boundObject": {"@": "owner"}, | 129 | "boundObject": {"@": "owner"}, |
| 130 | "boundObjectPropertyPath": "xAngle", | 130 | "boundObjectPropertyPath": "xAngle", |
| 131 | "oneway": false | 131 | "oneway": true |
| 132 | } | 132 | } |
| 133 | }, | 133 | }, |
| 134 | "listeners": [ | 134 | "listeners": [ |
| @@ -159,7 +159,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 159 | "value": { | 159 | "value": { |
| 160 | "boundObject": {"@": "owner"}, | 160 | "boundObject": {"@": "owner"}, |
| 161 | "boundObjectPropertyPath": "yAngle", | 161 | "boundObjectPropertyPath": "yAngle", |
| 162 | "oneway": false | 162 | "oneway": true |
| 163 | } | 163 | } |
| 164 | }, | 164 | }, |
| 165 | "listeners": [ | 165 | "listeners": [ |
| @@ -190,7 +190,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 190 | "value": { | 190 | "value": { |
| 191 | "boundObject": {"@": "owner"}, | 191 | "boundObject": {"@": "owner"}, |
| 192 | "boundObjectPropertyPath": "zAngle", | 192 | "boundObjectPropertyPath": "zAngle", |
| 193 | "oneway": false | 193 | "oneway": true |
| 194 | } | 194 | } |
| 195 | }, | 195 | }, |
| 196 | "listeners": [ | 196 | "listeners": [ |