diff options
author | hwc487 | 2012-02-08 14:48:16 -0800 |
---|---|---|
committer | hwc487 | 2012-02-08 14:48:16 -0800 |
commit | 43e713a85785cd170bf0f5312d149d93235dadf2 (patch) | |
tree | 2142672a6cefe6ae531b84f3e23920f36157d394 /js/panels/properties | |
parent | 468d324f8e9a5f018bc7609b58254ae468075ce9 (diff) | |
parent | 72805efb66c372bec2df8a2686dfd56c9ed26622 (diff) | |
download | ninja-43e713a85785cd170bf0f5312d149d93235dadf2.tar.gz |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Diffstat (limited to 'js/panels/properties')
-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 11a5b3f2..1e24cb55 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": true | 42 | "oneway": false |
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": true | 71 | "oneway": false |
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": true | 100 | "oneway": false |
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": true | 131 | "oneway": false |
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": true | 162 | "oneway": false |
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": true | 193 | "oneway": false |
194 | } | 194 | } |
195 | }, | 195 | }, |
196 | "listeners": [ | 196 | "listeners": [ |