diff options
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Materials/Materials.xml | 10 | ||||
-rwxr-xr-x | js/panels/properties/sections/three-d-view.reel/three-d-view.js | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index de07990e..cdeee69e 100755 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
@@ -2,7 +2,17 @@ | |||
2 | <tree id="Materials"> | 2 | <tree id="Materials"> |
3 | <folder id="ninjaMaterials" label="Ninja Materials"> | 3 | <folder id="ninjaMaterials" label="Ninja Materials"> |
4 | <leaf id="UberMaterial" label="Uber" /> | 4 | <leaf id="UberMaterial" label="Uber" /> |
5 | <leaf id="RadialBlurMaterial" label="Radial Blur" /> | ||
6 | <leaf id="PulseMaterial" label="Pulse" /> | ||
7 | <leaf id="TunnelMaterial" label="Tunnel" /> | ||
8 | <leaf id="TwistMaterial" label="Twist" /> | ||
9 | <leaf id="KeleidoscopeMaterial" label="Keleidoscope" /> | ||
10 | <leaf id="JuliaMaterial" label="Julia" /> | ||
11 | <leaf id="MandelMaterial" label="Mandel" /> | ||
12 | <leaf id="PlasmaMaterial" label="Plasma" /> | ||
5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> | 13 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
14 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | ||
15 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | ||
6 | </folder> | 16 | </folder> |
7 | <folder id="customMaterials" label="Custom Materials"> | 17 | <folder id="customMaterials" label="Custom Materials"> |
8 | <leaf id="CheckerBoard" label="CheckerBoard" /> | 18 | <leaf id="CheckerBoard" label="CheckerBoard" /> |
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js index 96053490..0c4a9171 100755 --- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js | |||
@@ -215,7 +215,8 @@ exports.ThreeD = Montage.create(Component, { | |||
215 | Object.defineBinding(this, "item", { | 215 | Object.defineBinding(this, "item", { |
216 | boundObject: this, | 216 | boundObject: this, |
217 | boundObjectPropertyPath: "application.ninja.selectedElements", | 217 | boundObjectPropertyPath: "application.ninja.selectedElements", |
218 | boundValueMutator: this._getSelectedItem | 218 | boundValueMutator: this._getSelectedItem, |
219 | oneway: true | ||
219 | }); | 220 | }); |
220 | } | 221 | } |
221 | }, | 222 | }, |